Change condition back to 'ContainersReady'

Increase time of waiting fot Deployment removal

Author: tellet

tests/suite/resources_utils.py

@@ -157,21 +157,21 @@ def create_daemon_set(extensions_v1_beta1: ExtensionsV1beta1Api, namespace, body
 
 def wait_until_all_pods_are_ready(v1: CoreV1Api, namespace) -> None:
     """
-    Wait for all the pods to be 'Ready'.
+    Wait for all the pods to be 'ContainersReady'.
 
     :param v1: CoreV1Api
     :param namespace: namespace of a pod
     :return:
     """
-    print("Start waiting for all pods in a namespace to be Ready")
+    print("Start waiting for all pods in a namespace to be ContainersReady")
     counter = 0
     while not are_all_pods_in_ready_state(v1, namespace) and counter < 20:
-        print("There are pods that are not running. Wait for 4 sec...")
+        print("There are pods that are not ContainersReady. Wait for 4 sec...")
         time.sleep(4)
         counter = counter + 1
     if counter >= 20:
-        pytest.fail("After several seconds the pods aren't Ready. Exiting...")
-    print("All pods are Ready")
+        pytest.fail("After several seconds the pods aren't ContainersReady. Exiting...")
+    print("All pods are ContainersReady")
 
 
 def get_first_pod_name(v1: CoreV1Api, namespace) -> str:
@@ -188,7 +188,7 @@ def get_first_pod_name(v1: CoreV1Api, namespace) -> str:
 
 def are_all_pods_in_ready_state(v1: CoreV1Api, namespace) -> bool:
     """
-    Check if all the pods have Ready condition.
+    Check if all the pods have ContainersReady condition.
 
     :param v1: CoreV1Api
     :param namespace: namespace
@@ -203,7 +203,7 @@ def are_all_pods_in_ready_state(v1: CoreV1Api, namespace) -> bool:
             return False
         for condition in pod.status.conditions:
             # wait for 'Ready' state instead of 'ContainersReady' for backwards compatibility with k8s 1.10
-            if condition.type == 'Ready' and condition.status == 'True':
+            if condition.type == 'ContainersReady' and condition.status == 'True':
                 pod_ready_amount = pod_ready_amount + 1
                 break
     return pod_ready_amount == len(pods.items)
@@ -385,12 +385,12 @@ def ensure_item_removal(get_item, *args, **kwargs) -> None:
     """
     try:
         counter = 0
-        while counter < 20:
+        while counter < 30:
             time.sleep(1)
             get_item(*args, **kwargs)
             counter = counter + 1
-        if counter >= 20:
-            pytest.fail("Failed to remove the item after 20 seconds")
+        if counter >= 30:
+            pytest.fail("Failed to remove the item after 30 seconds")
     except ApiException as ex:
         if ex.status == 404:
             print("Item was removed")