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

Environment class cleanup

Browse source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-03-08 16:54:14 -08:00
commit 1801f83bb8
7 changed files with 58 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/config/config_test.py
View file

@ -2042,7 +2042,7 @@ class EnvTest(unittest.TestCase):
},
}
self.assertEqual(
resolve_environment(service_dict, Environment(None)),
resolve_environment(service_dict, Environment()),
{'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': None},
)
@ -2080,7 +2080,7 @@ class EnvTest(unittest.TestCase):
os.environ['ENV_DEF'] = 'E3'
self.assertEqual(
resolve_environment(
{'env_file': ['tests/fixtures/env/resolve.env']}, Environment(None)
{'env_file': ['tests/fixtures/env/resolve.env']}, Environment()
),
{
'FILE_DEF': u'bär',
@ -2104,7 +2104,7 @@ class EnvTest(unittest.TestCase):
}
}
self.assertEqual(
resolve_build_args(build, Environment(build['context'])),
resolve_build_args(build, Environment.from_env_file(build['context'])),
{'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': None},
)

4
tests/unit/config/interpolation_test.py
View file

@ -44,7 +44,7 @@ def test_interpolate_environment_variables_in_services(mock_env):
}
}
assert interpolate_environment_variables(
services, 'service', Environment(None)
services, 'service', Environment()
) == expected
@ -70,5 +70,5 @@ def test_interpolate_environment_variables_in_volumes(mock_env):
'other': {},
}
assert interpolate_environment_variables(
volumes, 'volume', Environment(None)
volumes, 'volume', Environment()
) == expected