tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test that values in 'environment' override env files 

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-11-09 15:10:02 +00:00 committed by Joffrey F
parent 4d85caf143
commit 46f034705e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/config/config_test.py
View File

@ -2493,6 +2493,15 @@ class EnvTest(unittest.TestCase):
{'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'bar'}, {'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'bar'},
) )
def test_environment_overrides_env_file(self):
self.assertEqual(
resolve_environment({
'environment': {'FOO': 'baz'},
'env_file': ['tests/fixtures/env/one.env'],
}),
{'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'baz'},
)
def test_resolve_environment_with_multiple_env_files(self): def test_resolve_environment_with_multiple_env_files(self):
service_dict = { service_dict = {
'env_file': [ 'env_file': [