Fix tests

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-10-26 10:27:57 +00:00 • committed by Daniel Nephin
commit da41ed22f9
4 changed files with 4 additions and 5 deletions

View file

@ -362,6 +362,7 @@ class ServiceTest(DockerClientTestCase):
new_container, = service.execute_convergence_plan(
ConvergencePlan('recreate', [old_container]))
self.assertEqual(list(new_container.get('Volumes')), ['/data'])
self.assertEqual(new_container.get('Volumes')['/data'], volume_path)

View file

@ -185,8 +185,7 @@ def converge(service,
do_build=True):
"""Create a converge plan from a strategy and execute the plan."""
plan = service.convergence_plan(strategy)
containers, logging_threads = zip(*service.execute_convergence_plan(plan, do_build=do_build, timeout=1))
return containers
return service.execute_convergence_plan(plan, do_build=do_build, timeout=1)
class ServiceStateTest(DockerClientTestCase):