Update integration tests for multiple file support

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-09-11 20:50:31 -04:00
commit c0c9a7c1e4
4 changed files with 16 additions and 9 deletions

View file

@ -68,7 +68,8 @@ def get_config_path(file_option):
log.warn('The FIG_FILE environment variable is deprecated.')
log.warn('Please use COMPOSE_FILE instead.')
return [os.environ.get('COMPOSE_FILE') or os.environ.get('FIG_FILE')]
config_file = os.environ.get('COMPOSE_FILE') or os.environ.get('FIG_FILE')
return [config_file] if config_file else None
def get_client(verbose=False):