Merge pull request #445 from jsmolar/jsmolar2

Moved wait_for_ready to parent object for CRs

testsuite/openshift/__init__.py

@@ -58,6 +58,16 @@ def safe_apply(self):
         assert status, f"Unable to apply changes for APIObject with result: {result}"
         return result
 
+    def wait_for_ready(self):
+        """Waits until CR reports ready status"""
+        with timeout(90):
+            success, _, _ = self.self_selector().until_all(
+                success_func=lambda obj: len(obj.model.status.conditions) > 0
+                and all(x.status == "True" for x in obj.model.status.conditions)
+            )
+            assert success, f"{self.kind()} did got get ready in time"
+            self.refresh()
+
     def __getitem__(self, name):
         return self.model.spec[name]
 

testsuite/openshift/authorino.py

@@ -4,7 +4,7 @@
 from dataclasses import dataclass
 from typing import Any, Optional, Dict, List
 
-from openshift_client import selector, timeout
+from openshift_client import selector
 
 from testsuite.lifecycle import LifecycleObject
 from testsuite.openshift import CustomResource
@@ -86,16 +86,6 @@ def create_instance(
         with openshift.context:
             return cls(model)
 
-    def wait_for_ready(self):
-        """Waits until Authorino CR reports ready status"""
-        with timeout(90):
-            success, _, _ = self.self_selector().until_all(
-                success_func=lambda obj: len(obj.model.status.conditions) > 0
-                and all(x.status == "True" for x in obj.model.status.conditions)
-            )
-            assert success, "Authorino did got get ready in time"
-            self.refresh()
-
     @property
     def deployment(self):
         """Returns Deployment object for this Authorino"""

testsuite/openshift/kuadrant.py

@@ -2,7 +2,7 @@
 
 import dataclasses
 
-from openshift_client import selector, timeout
+from openshift_client import selector
 
 from testsuite.openshift import CustomResource
 from testsuite.openshift.deployment import Deployment
@@ -59,13 +59,3 @@ def limitador_deployment(self):
         """Returns Deployment object for this Authorino"""
         with self.context:
             return selector(f"deployment/{self.LIMITADOR}").object(cls=Deployment)
-
-    def wait_for_ready(self):
-        """Waits until Kuadrant CR reports ready status"""
-        with timeout(90):
-            success, _, _ = self.self_selector().until_all(
-                success_func=lambda obj: len(obj.model.status.conditions) > 0
-                and all(x.status == "True" for x in obj.model.status.conditions)
-            )
-            assert success, "Kuadrant did got get ready in time"
-            self.refresh()