mirror of
https://github.com/docker/compose.git
synced 2025-07-23 13:45:00 +02:00
Update volume tests for clarity
- Better method names. - Environment variable syntax in volume paths, even when a driver is specified, now *will* be processed (the test wasn't testing it properly). However, `~` will still *not* expand to the user's home directory. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
parent
f7b9daf927
commit
fdaa5f2cde
@ -117,7 +117,7 @@ class InterpolationTest(unittest.TestCase):
|
|||||||
d = make_service_dict('foo', {'volumes': ['~:/container/path']}, working_dir='.')
|
d = make_service_dict('foo', {'volumes': ['~:/container/path']}, working_dir='.')
|
||||||
self.assertEqual(d['volumes'], ['/home/user:/container/path'])
|
self.assertEqual(d['volumes'], ['/home/user:/container/path'])
|
||||||
|
|
||||||
def test_named_volume_with_driver(self):
|
def test_named_volume_with_driver_does_not_expand(self):
|
||||||
d = make_service_dict('foo', {
|
d = make_service_dict('foo', {
|
||||||
'volumes': ['namedvolume:/data'],
|
'volumes': ['namedvolume:/data'],
|
||||||
'volume_driver': 'foodriver',
|
'volume_driver': 'foodriver',
|
||||||
@ -125,13 +125,13 @@ class InterpolationTest(unittest.TestCase):
|
|||||||
self.assertEqual(d['volumes'], ['namedvolume:/data'])
|
self.assertEqual(d['volumes'], ['namedvolume:/data'])
|
||||||
|
|
||||||
@mock.patch.dict(os.environ)
|
@mock.patch.dict(os.environ)
|
||||||
def test_named_volume_with_special_chars(self):
|
def test_home_directory_with_driver_does_not_expand(self):
|
||||||
os.environ['NAME'] = 'surprise!'
|
os.environ['NAME'] = 'surprise!'
|
||||||
d = make_service_dict('foo', {
|
d = make_service_dict('foo', {
|
||||||
'volumes': ['~/${NAME}:/data'],
|
'volumes': ['~:/data'],
|
||||||
'volume_driver': 'foodriver',
|
'volume_driver': 'foodriver',
|
||||||
}, working_dir='.')
|
}, working_dir='.')
|
||||||
self.assertEqual(d['volumes'], ['~/${NAME}:/data'])
|
self.assertEqual(d['volumes'], ['~:/data'])
|
||||||
|
|
||||||
|
|
||||||
class MergePathMappingTest(object):
|
class MergePathMappingTest(object):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user