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

Resolves #447, fix volume logic for recreate container

Browse source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2014-12-06 17:51:49 -05:00
commit 7eb476e61d
4 changed files with 117 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/integration/service_test.py
View file

@ -98,7 +98,7 @@ class ServiceTest(DockerClientTestCase):
service = self.create_service('db', volumes=['/var/db'])
container = service.create_container()
service.start_container(container)
self.assertIn('/var/db', container.inspect()['Volumes'])
self.assertIn('/var/db', container.get('Volumes'))
def test_create_container_with_cpu_shares(self):
service = self.create_service('db', cpu_shares=73)
@ -179,6 +179,16 @@ class ServiceTest(DockerClientTestCase):
service.recreate_containers()
self.assertEqual(len(service.containers(stopped=True)), 1)
def test_recreate_containers_with_volume_changes(self):
service = self.create_service('withvolumes', volumes=['/etc'])
old_container = create_and_start_container(service)
self.assertEqual(old_container.get('Volumes').keys(), ['/etc'])
service = self.create_service('withvolumes')
container, = service.recreate_containers()
service.start_container(container)
self.assertEqual(container.get('Volumes'), {})
def test_start_container_passes_through_options(self):
db = self.create_service('db')
create_and_start_container(db, environment={'FOO': 'BAR'})