Attempting to make service update tests less flaky

Signed-off-by: Viktor Adam <[email protected]>

Author: rycus86

tests/integration/api_service_test.py

@@ -1150,7 +1150,7 @@ def _update_service(self, svc_id, *args, **kwargs):
         try:
             self.client.update_service(*args, **kwargs)
         except docker.errors.APIError as e:
-            if e.explanation == "update out of sequence":
+            if e.explanation.endswith("update out of sequence"):
                 svc_info = self.client.inspect_service(svc_id)
                 version_index = svc_info['Version']['Index']
 
@@ -1160,3 +1160,5 @@ def _update_service(self, svc_id, *args, **kwargs):
                     kwargs['version'] = version_index
 
                 self.client.update_service(*args, **kwargs)
+            else:
+                raise

tests/integration/models_services_test.py

@@ -188,16 +188,20 @@ def test_scale_service(self):
             image="alpine",
             command="sleep 300"
         )
-        assert len(service.tasks()) == 1
+        tasks = []
+        while len(tasks) == 0:
+            tasks = service.tasks()
+        assert len(tasks) == 1
         service.update(
             # create argument
             name=service.name,
             mode=docker.types.ServiceMode('replicated', replicas=2),
             # ContainerSpec argument
             command="sleep 600"
         )
-        service.reload()
-        assert len(service.tasks()) >= 2
+        while len(tasks) == 1:
+            tasks = service.tasks()
+        assert len(tasks) >= 2
 
     @helpers.requires_api_version('1.25')
     def test_restart_service(self):