updated unit tests

Author: Bobbins228

src/codeflare_sdk/cluster/cluster.py

@@ -342,7 +342,7 @@ def is_dashboard_ready(self) -> bool:
                 timeout=5,
                 verify=self._client_verify_tls,
             )
-        except requests.exceptions.SSLError:
+        except requests.exceptions.SSLError:  # pragma no cover
             # SSL exception occurs when oauth ingress has been created but cluster is not up
             return False
         if response.status_code == 200:
@@ -407,7 +407,7 @@ def cluster_dashboard_uri(self) -> str:
             config_check()
             api_instance = client.NetworkingV1Api(api_config_handler())
             ingresses = api_instance.list_namespaced_ingress(self.config.namespace)
-        except Exception as e:
+        except Exception as e:  # pragma no cover
             return _kube_api_error_handling(e)
 
         for ingress in ingresses.items:
@@ -770,7 +770,7 @@ def _map_to_ray_cluster(rc) -> Optional[RayCluster]:
         config_check()
         api_instance = client.NetworkingV1Api(api_config_handler())
         ingresses = api_instance.list_namespaced_ingress(rc["metadata"]["namespace"])
-    except Exception as e:
+    except Exception as e:  # pragma no cover
         return _kube_api_error_handling(e)
     ray_ingress = None
     for ingress in ingresses.items:

tests/unit_test.py

@@ -43,7 +43,10 @@
     KubeConfigFileAuthentication,
     config_check,
 )
-from codeflare_sdk.utils.openshift_oauth import create_openshift_oauth_objects
+from codeflare_sdk.utils.openshift_oauth import (
+    create_openshift_oauth_objects,
+    delete_openshift_oauth_objects,
+)
 from codeflare_sdk.utils.pretty_print import (
     print_no_resources_found,
     print_app_wrappers_status,
@@ -489,13 +492,44 @@ def test_rc_status(mocker):
     assert rc == None
 
 
+def test_delete_openshift_oauth_objects(mocker):
+    mocker.patch.object(client.CoreV1Api, "delete_namespaced_service_account")
+    mocker.patch.object(client.CoreV1Api, "delete_namespaced_service")
+    mocker.patch.object(client.NetworkingV1Api, "delete_namespaced_ingress")
+    mocker.patch.object(client.RbacAuthorizationV1Api, "delete_cluster_role_binding")
+    delete_openshift_oauth_objects("test-cluster", "test-namespace")
+
+    client.CoreV1Api.delete_namespaced_service_account.assert_called_with(
+        name="test-cluster-oauth-proxy", namespace="test-namespace"
+    )
+    client.CoreV1Api.delete_namespaced_service.assert_called_with(
+        name="test-cluster-oauth", namespace="test-namespace"
+    )
+    client.NetworkingV1Api.delete_namespaced_ingress.assert_called_with(
+        name="test-cluster-ingress", namespace="test-namespace"
+    )
+    client.RbacAuthorizationV1Api.delete_cluster_role_binding.assert_called_with(
+        name="test-cluster-rb"
+    )
+
+
 def test_cluster_uris(mocker):
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
     mocker.patch(
         "codeflare_sdk.cluster.cluster._get_ingress_domain",
         return_value="apps.cluster.awsroute.org",
     )
     cluster = cluster = createClusterWithConfig(mocker)
+    mocker.patch(
+        "kubernetes.client.NetworkingV1Api.list_namespaced_ingress",
+        return_value=ingress_retrieval(
+            port=8265, annotations={"route.openshift.io/termination": "passthrough"}
+        ),
+    )
+    assert (
+        cluster.cluster_dashboard_uri()
+        == "https://ray-dashboard-unit-test-cluster-ns.apps.cluster.awsroute.org"
+    )
     mocker.patch(
         "kubernetes.client.NetworkingV1Api.list_namespaced_ingress",
         return_value=ingress_retrieval(port=8265),
@@ -543,13 +577,15 @@ def ray_addr(self, *args):
     return self._address
 
 
-def ingress_retrieval(port):
+def ingress_retrieval(port, annotations=None):
     if port == 10001:
         serviceName = "client"
     else:
         serviceName = "dashboard"
     mock_ingress = client.V1Ingress(
-        metadata=client.V1ObjectMeta(name=f"ray-{serviceName}-unit-test-cluster"),
+        metadata=client.V1ObjectMeta(
+            name=f"ray-{serviceName}-unit-test-cluster", annotations=annotations
+        ),
         spec=client.V1IngressSpec(
             rules=[
                 client.V1IngressRule(