Improving coverage of cluster.py

Author: akram

src/codeflare_sdk/ray/cluster/test_cluster.py

@@ -78,7 +78,6 @@ def test_cluster_apply_scale_up_scale_down(mocker):
     mocker.patch("kubernetes.client.ApisApi.get_api_versions")
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
     mock_dynamic_client = mocker.Mock()
-    mocker.patch("codeflare_sdk.ray.cluster.cluster.Cluster._throw_for_no_raycluster")
     mocker.patch(
         "kubernetes.dynamic.DynamicClient.resources", new_callable=mocker.PropertyMock
     )
@@ -149,6 +148,77 @@ def test_cluster_apply_with_file(mocker):
     cluster.down()
 
 
+def test_cluster_apply_with_appwrapper(mocker):
+    # Mock Kubernetes client and dynamic client methods
+    mocker.patch("kubernetes.client.ApisApi.get_api_versions")
+    mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
+    mocker.patch(
+        "codeflare_sdk.ray.cluster.cluster._check_aw_exists",
+        return_value=True,
+    )
+    mock_dynamic_client = mocker.Mock()
+    mocker.patch("codeflare_sdk.ray.cluster.cluster.Cluster._throw_for_no_raycluster")
+    mocker.patch(
+        "kubernetes.dynamic.DynamicClient.resources", new_callable=mocker.PropertyMock
+    )
+    mocker.patch(
+        "codeflare_sdk.ray.cluster.cluster.Cluster.create_resource",
+        return_value="./tests/test_cluster_yamls/ray/default-ray-cluster.yaml",
+    )
+    mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
+
+    # Create a cluster configuration with appwrapper set to False
+    cluster = create_cluster(mocker, 1, write_to_file=False)
+    patch_cluster_with_dynamic_client(mocker, cluster, mock_dynamic_client)
+
+    # Mock listing RayCluster to simulate it doesn't exist
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
+        return_value=get_obj_none("ray.io", "v1", "ns", "rayclusters"),
+    )
+    # Call the apply method
+    cluster.apply()
+
+    # Assertions
+    print("Cluster applied without AppWrapper.")
+
+
+def test_cluster_apply_without_appwrapper_write_to_file(mocker):
+    # Mock Kubernetes client and dynamic client methods
+    mocker.patch("kubernetes.client.ApisApi.get_api_versions")
+    mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
+    mocker.patch(
+        "codeflare_sdk.ray.cluster.cluster._check_aw_exists",
+        return_value=True,
+    )
+    mock_dynamic_client = mocker.Mock()
+    mocker.patch("codeflare_sdk.ray.cluster.cluster.Cluster._throw_for_no_raycluster")
+    mocker.patch(
+        "kubernetes.dynamic.DynamicClient.resources", new_callable=mocker.PropertyMock
+    )
+    mocker.patch(
+        "codeflare_sdk.ray.cluster.cluster.Cluster.create_resource",
+        return_value="./tests/test_cluster_yamls/ray/default-ray-cluster.yaml",
+    )
+    mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
+
+    # Create a cluster configuration with appwrapper set to False
+    cluster = create_cluster(mocker, 1, write_to_file=True)
+    patch_cluster_with_dynamic_client(mocker, cluster, mock_dynamic_client)
+    cluster.config.appwrapper = False
+
+    # Mock listing RayCluster to simulate it doesn't exist
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
+        return_value=get_obj_none("ray.io", "v1", "ns", "rayclusters"),
+    )
+    # Call the apply method
+    cluster.apply()
+
+    # Assertions
+    print("Cluster applied without AppWrapper.")
+
+
 def test_cluster_apply_without_appwrapper(mocker):
     # Mock Kubernetes client and dynamic client methods
     mocker.patch("kubernetes.client.ApisApi.get_api_versions")