Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-10-20 19:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove rebuild parameter ; set do_build instead

Browse source 
Reduce repetition in main.py

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-01-11 16:37:09 -08:00
parent 7591639c72
commit 2d986dff79
4 changed files with 33 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/unit/service_test.py
View file

@ -923,10 +923,18 @@ class ServiceVolumesTest(unittest.TestCase):
VolumeSpec.parse('imagedata:/mnt/image/data:rw'),
]
volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [], False)
volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [])
assert sorted(volumes) == sorted(expected)
def test_get_container_data_volumes_image_is_none(self):
# Issue 5465, check for non-existant image.
options = [VolumeSpec.parse(v) for v in [
'/host/volume:/host/volume:ro',
'/new/volume',
'/existing/volume',
'named:/named/vol',
'/dev/tmpfs'
]]
container = Container(self.mock_client, {
'Image': None,
@ -935,7 +943,7 @@ class ServiceVolumesTest(unittest.TestCase):
expected = []
volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [], False)
volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [])
assert sorted(volumes) == sorted(expected)
def test_merge_volume_bindings(self):
@ -971,7 +979,7 @@ class ServiceVolumesTest(unittest.TestCase):
'existingvolume:/existing/volume:rw',
]
binds, affinity = merge_volume_bindings(options, ['/dev/tmpfs'], previous_container, [], False)
binds, affinity = merge_volume_bindings(options, ['/dev/tmpfs'], previous_container, [])
assert sorted(binds) == sorted(expected)
assert affinity == {'affinity:container': '=cdefab'}