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

Fix volume merging when there's no explicit host path

Browse source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-03-23 11:40:44 -07:00
commit 35c6e0314c
2 changed files with 50 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tests/unit/config_test.py
View file

@ -40,26 +40,44 @@ class ConfigTest(unittest.TestCase):
class MergeTest(unittest.TestCase):
def test_merge_volumes(self):
def test_merge_volumes_empty(self):
service_dict = config.merge_service_dicts({}, {})
self.assertNotIn('volumes', service_dict)
service_dict = config.merge_service_dicts({
'volumes': ['/foo:/data'],
}, {})
self.assertEqual(service_dict['volumes'], ['/foo:/data'])
def test_merge_volumes_no_override(self):
service_dict = config.merge_service_dicts(
{'volumes': ['/foo:/code', '/data']},
{},
)
self.assertEqual(set(service_dict['volumes']), set(['/foo:/code', '/data']))
service_dict = config.merge_service_dicts({}, {
'volumes': ['/bar:/data'],
})
self.assertEqual(service_dict['volumes'], ['/bar:/data'])
def test_merge_volumes_no_base(self):
service_dict = config.merge_service_dicts(
{},
{'volumes': ['/bar:/code']},
)
self.assertEqual(set(service_dict['volumes']), set(['/bar:/code']))
service_dict = config.merge_service_dicts({
'volumes': ['/foo:/data'],
}, {
'volumes': ['/bar:/data'],
})
self.assertEqual(service_dict['volumes'], ['/bar:/data'])
def test_merge_volumes_override_explicit_path(self):
service_dict = config.merge_service_dicts(
{'volumes': ['/foo:/code', '/data']},
{'volumes': ['/bar:/code']},
)
self.assertEqual(set(service_dict['volumes']), set(['/bar:/code', '/data']))
def test_merge_volumes_add_explicit_path(self):
service_dict = config.merge_service_dicts(
{'volumes': ['/foo:/code', '/data']},
{'volumes': ['/bar:/code', '/quux:/data']},
)
self.assertEqual(set(service_dict['volumes']), set(['/bar:/code', '/quux:/data']))
def test_merge_volumes_remove_explicit_path(self):
service_dict = config.merge_service_dicts(
{'volumes': ['/foo:/code', '/quux:/data']},
{'volumes': ['/bar:/code', '/data']},
)
self.assertEqual(set(service_dict['volumes']), set(['/bar:/code', '/data']))
class EnvTest(unittest.TestCase):