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

Fix environment resolution

Browse source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-03-12 13:59:23 +00:00
commit 528bed9ef6
7 changed files with 77 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/unit/config_test.py
View file

@ -90,7 +90,8 @@ class ConfigTest(unittest.TestCase):
def test_env_from_file(self):
service_dict = config.make_service_dict(
'foo',
{'env_file': 'tests/fixtures/env/one.env'},
{'env_file': 'one.env'},
'tests/fixtures/env',
)
self.assertEqual(
service_dict['environment'],
@ -100,12 +101,8 @@ class ConfigTest(unittest.TestCase):
def test_env_from_multiple_files(self):
service_dict = config.make_service_dict(
'foo',
{
'env_file': [
'tests/fixtures/env/one.env',
'tests/fixtures/env/two.env',
],
},
{'env_file': ['one.env', 'two.env']},
'tests/fixtures/env',
)
self.assertEqual(
service_dict['environment'],
@ -113,10 +110,10 @@ class ConfigTest(unittest.TestCase):
)
def test_env_nonexistent_file(self):
options = {'env_file': 'tests/fixtures/env/nonexistent.env'}
options = {'env_file': 'nonexistent.env'}
self.assertRaises(
config.ConfigurationError,
lambda: config.make_service_dict('foo', options),
lambda: config.make_service_dict('foo', options, 'tests/fixtures/env'),
)
@mock.patch.dict(os.environ)
@ -126,7 +123,8 @@ class ConfigTest(unittest.TestCase):
os.environ['ENV_DEF'] = 'E3'
service_dict = config.make_service_dict(
'foo',
{'env_file': 'tests/fixtures/env/resolve.env'},
{'env_file': 'resolve.env'},
'tests/fixtures/env',
)
self.assertEqual(
service_dict['environment'],