more timeout tweaks

autopilotpattern · Feb 8, 2017 · 88f4604 · 88f4604
1 parent db36773
commit 88f4604
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/test/tests.py b/test/tests.py
@@ -51,7 +51,7 @@ def test_scaleup_and_down(self):
         self.compose_scale('backend', 2)
         self.instrument(self.wait_for_containers,
                         {'backend': 2, "nginx": 1, "consul": 1}, timeout=300)
-        self.instrument(self.wait_for_service, 'backend', count=2)
+        self.instrument(self.wait_for_service, 'backend', count=2, timeout=60)
         self.compare_backends()
 
         # netsplit a backend
@@ -61,7 +61,7 @@ def test_scaleup_and_down(self):
 
         # heal netsplit
         self.docker_exec('backend_2', 'ifconfig eth0 up')
-        self.instrument(self.wait_for_service, 'backend', count=2)
+        self.instrument(self.wait_for_service, 'backend', count=2, timeout=60)
         self.compare_backends()
 
     def wait_for_containers(self, expected={}, timeout=30):