jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unit tests for multiple files

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-09-14 21:35:41 -04:00
commit 89be7f1fa7
2 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compose/config/config.py
View file

@ -166,14 +166,16 @@ def load(config_details):
for name in set(base) | set(override)
}
def combine_configs(override, base):
def combine_configs(base, override):
service_dicts = load_file(base.filename, base.config)
if not override:
return service_dicts
return merge_service_dicts(base.config, override.config)
return ConfigFile(
override.filename,
merge_services(base.config, override.config))
return reduce(combine_configs, configs, None)
return reduce(combine_configs, configs + [None])
class ServiceLoader(object):