Address review comments for MaaS RBAC tests

Author: SB159

tests/conftest.py

@@ -782,3 +782,10 @@ def gpu_count_on_cluster(nodes: list[Any]) -> int:
                     LOGGER.debug(f"Skipping non-integer allocatable for {key} on {node.name}: {val!r}")
                     continue
     return total_gpus
+
+
+@pytest.fixture(scope="session")
+def original_user() -> str:
+    current_user = run_command(command=["oc", "whoami"])[1].strip()
+    LOGGER.info(f"Original user: {current_user}")
+    return current_user

tests/model_registry/conftest.py

@@ -34,13 +34,14 @@
 from pytest_testconfig import config as py_config
 from model_registry.types import RegisteredModel
 
-from tests.model_registry.rbac.utils import wait_for_oauth_openshift_deployment
+from utilities.general import wait_for_oauth_openshift_deployment
 from tests.model_registry.utils import (
     generate_namespace_name,
     get_rest_headers,
     wait_for_default_resource_cleanedup,
     get_byoidc_user_credentials,
 )
+
 from utilities.general import generate_random_name, wait_for_pods_running
 
 from tests.model_registry.constants import (
@@ -541,13 +542,6 @@ def api_server_url(admin_client: DynamicClient) -> str:
     return infrastructure.instance.status.apiServerURL
 
 
-@pytest.fixture(scope="session")
-def original_user() -> str:
-    current_user = run_command(command=["oc", "whoami"])[1].strip()
-    LOGGER.info(f"Original user: {current_user}")
-    return current_user
-
-
 @pytest.fixture(scope="module")
 def created_htpasswd_secret(
     is_byoidc: bool, original_user: str, user_credentials_rbac: dict[str, str]

tests/model_registry/rbac/utils.py

@@ -68,27 +68,6 @@ def assert_positive_mr_registry(
     LOGGER.info("Client instantiated successfully after granting permissions.")
 
 
-def wait_for_oauth_openshift_deployment() -> None:
-    deployment_obj = Deployment(name="oauth-openshift", namespace="openshift-authentication", ensure_exists=True)
-
-    _log = f"Wait for {deployment_obj.name} -> Type: Progressing -> Reason:"
-
-    def _wait_sampler(_reason: str) -> None:
-        sampler = TimeoutSampler(
-            wait_timeout=240,
-            sleep=5,
-            func=lambda: deployment_obj.instance.status.conditions,
-        )
-        for sample in sampler:
-            for _spl in sample:
-                if _spl.type == "Progressing" and _spl.reason == _reason:
-                    return
-
-    for reason in ("ReplicaSetUpdated", "NewReplicaSetAvailable"):
-        LOGGER.info(f"{_log} {reason}")
-        _wait_sampler(_reason=reason)
-
-
 def create_role_binding(
     admin_client: DynamicClient,
     model_registry_namespace: str,