added kubeconfig loads to test

Signed-off-by: Pat O'Connor <[email protected]>

Author: chipspeak

src/codeflare_sdk/ray/rayjobs/test_rayjob.py

@@ -446,11 +446,13 @@ def test_submit_with_auto_cluster(mocker):
 
 def test_namespace_auto_detection_success(mocker):
     """Test successful namespace auto-detection."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch(
         "codeflare_sdk.ray.rayjobs.rayjob.get_current_namespace",
         return_value="detected-ns",
     )
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     rayjob = RayJob(
         job_name="test-job", entrypoint="python script.py", cluster_name="test-cluster"
@@ -461,10 +463,12 @@ def test_namespace_auto_detection_success(mocker):
 
 def test_namespace_auto_detection_fallback(mocker):
     """Test that namespace auto-detection failure raises an error."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch(
         "codeflare_sdk.ray.rayjobs.rayjob.get_current_namespace", return_value=None
     )
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     with pytest.raises(ValueError, match="Could not auto-detect Kubernetes namespace"):
         RayJob(
@@ -476,11 +480,13 @@ def test_namespace_auto_detection_fallback(mocker):
 
 def test_namespace_explicit_override(mocker):
     """Test that explicit namespace overrides auto-detection."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch(
         "codeflare_sdk.ray.rayjobs.rayjob.get_current_namespace",
         return_value="detected-ns",
     )
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     rayjob = RayJob(
         job_name="test-job",
@@ -494,7 +500,9 @@ def test_namespace_explicit_override(mocker):
 
 def test_shutdown_behavior_with_cluster_config(mocker):
     """Test that shutdown_after_job_finishes is True when cluster_config is provided."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     from codeflare_sdk.ray.rayjobs.config import ManagedClusterConfig
 
@@ -512,7 +520,9 @@ def test_shutdown_behavior_with_cluster_config(mocker):
 
 def test_shutdown_behavior_with_existing_cluster(mocker):
     """Test that shutdown_after_job_finishes is False when using existing cluster."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     rayjob = RayJob(
         job_name="test-job",
@@ -526,7 +536,9 @@ def test_shutdown_behavior_with_existing_cluster(mocker):
 
 def test_rayjob_with_rayjob_cluster_config(mocker):
     """Test RayJob with the new ManagedClusterConfig."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     from codeflare_sdk.ray.rayjobs.config import ManagedClusterConfig
 
@@ -549,7 +561,9 @@ def test_rayjob_with_rayjob_cluster_config(mocker):
 
 def test_rayjob_cluster_config_validation(mocker):
     """Test validation of ManagedClusterConfig parameters."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     from codeflare_sdk.ray.rayjobs.config import ManagedClusterConfig
 
@@ -621,7 +635,9 @@ def test_build_ray_cluster_spec_integration(mocker):
 
 def test_rayjob_with_runtime_env(mocker):
     """Test RayJob with runtime environment configuration."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     runtime_env = {"pip": ["numpy", "pandas"]}
 
@@ -642,7 +658,9 @@ def test_rayjob_with_runtime_env(mocker):
 
 def test_rayjob_with_active_deadline_and_ttl(mocker):
     """Test RayJob with both active deadline and TTL settings."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     rayjob = RayJob(
         job_name="test-job",
@@ -664,7 +682,9 @@ def test_rayjob_with_active_deadline_and_ttl(mocker):
 
 def test_rayjob_cluster_name_generation_with_config(mocker):
     """Test cluster name generation when using cluster_config."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     from codeflare_sdk.ray.rayjobs.config import ManagedClusterConfig
 
@@ -684,7 +704,9 @@ def test_rayjob_cluster_name_generation_with_config(mocker):
 
 def test_rayjob_namespace_propagation_to_cluster_config(mocker):
     """Test that job namespace is propagated to cluster config when None."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     from codeflare_sdk.ray.rayjobs.rayjob import get_current_namespace
 
@@ -719,7 +741,9 @@ def test_rayjob_error_handling_invalid_cluster_config(mocker):
 
 def test_rayjob_constructor_parameter_validation(mocker):
     """Test constructor parameter validation."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     # Test with valid parameters
     rayjob = RayJob(
@@ -941,7 +965,9 @@ def test_build_ray_cluster_spec_with_image_pull_secrets(mocker):
 
 def test_rayjob_user_override_shutdown_behavior(mocker):
     """Test that user can override the auto-detected shutdown behavior."""
+    mocker.patch("kubernetes.config.load_kube_config")
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     # Test 1: User overrides shutdown to True even when using existing cluster
     rayjob_existing_override = RayJob(
@@ -1009,6 +1035,7 @@ def test_submit_with_cluster_config_compatible_image_passes(self, mocker):
         """Test that submission passes with compatible cluster_config image."""
         mocker.patch("kubernetes.config.load_kube_config")
         mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+        mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
         mock_api_instance = MagicMock()
         mock_api_class.return_value = mock_api_instance
         mock_api_instance.submit_job.return_value = True
@@ -1030,6 +1057,7 @@ def test_submit_with_cluster_config_incompatible_image_fails(self, mocker):
         """Test that submission fails with incompatible cluster_config image."""
         mocker.patch("kubernetes.config.load_kube_config")
         mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+        mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
         mock_api_instance = MagicMock()
         mock_api_class.return_value = mock_api_instance
 
@@ -1052,6 +1080,7 @@ def test_validate_ray_version_compatibility_method(self, mocker):
         """Test the _validate_ray_version_compatibility method directly."""
         mocker.patch("kubernetes.config.load_kube_config")
         mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+        mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
         mock_api_instance = MagicMock()
         mock_api_class.return_value = mock_api_instance
 
@@ -1087,6 +1116,7 @@ def test_validate_cluster_config_image_method(self, mocker):
         """Test the _validate_cluster_config_image method directly."""
         mocker.patch("kubernetes.config.load_kube_config")
         mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+        mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
         mock_api_instance = MagicMock()
         mock_api_class.return_value = mock_api_instance
 
@@ -1122,6 +1152,7 @@ def test_validate_cluster_config_image_edge_cases(self, mocker):
         """Test edge cases in _validate_cluster_config_image method."""
         mocker.patch("kubernetes.config.load_kube_config")
         mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+        mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
         mock_api_instance = MagicMock()
         mock_api_class.return_value = mock_api_instance
 

src/codeflare_sdk/ray/rayjobs/test_status.py

@@ -24,8 +24,11 @@ def test_rayjob_status(mocker):
     """
     Test the RayJob status method with different deployment statuses.
     """
+    # Mock kubernetes config loading
+    mocker.patch("kubernetes.config.load_kube_config")
     # Mock the RayjobApi to avoid actual Kubernetes calls
     mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
     mock_api_instance = mock_api_class.return_value
 
     # Create a RayJob instance
@@ -101,7 +104,9 @@ def test_rayjob_status_unknown_deployment_status(mocker):
     """
     Test handling of unknown deployment status from the API.
     """
+    mocker.patch("kubernetes.config.load_kube_config")
     mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
     mock_api_instance = mock_api_class.return_value
 
     rayjob = RayJob(
@@ -129,7 +134,9 @@ def test_rayjob_status_missing_fields(mocker):
     """
     Test handling of API response with missing fields.
     """
+    mocker.patch("kubernetes.config.load_kube_config")
     mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
     mock_api_instance = mock_api_class.return_value
 
     rayjob = RayJob(
@@ -154,8 +161,11 @@ def test_map_to_codeflare_status(mocker):
     """
     Test the _map_to_codeflare_status helper method directly.
     """
+    # Mock kubernetes config loading
+    mocker.patch("kubernetes.config.load_kube_config")
     # Mock the RayjobApi constructor to avoid authentication issues
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
 
     rayjob = RayJob(
         job_name="test-job",
@@ -217,8 +227,10 @@ def test_rayjob_status_print_no_job_found(mocker):
     """
     Test that pretty_print.print_no_job_found is called when no job is found and print_to_console=True.
     """
+    mocker.patch("kubernetes.config.load_kube_config")
     # Mock the RayjobApi and pretty_print
     mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
     mock_api_instance = mock_api_class.return_value
     mock_print_no_job_found = mocker.patch(
         "codeflare_sdk.ray.rayjobs.pretty_print.print_no_job_found"
@@ -248,8 +260,10 @@ def test_rayjob_status_print_job_found(mocker):
     """
     Test that pretty_print.print_job_status is called when job is found and print_to_console=True.
     """
+    mocker.patch("kubernetes.config.load_kube_config")
     # Mock the RayjobApi and pretty_print
     mock_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
     mock_api_instance = mock_api_class.return_value
     mock_print_job_status = mocker.patch(
         "codeflare_sdk.ray.rayjobs.pretty_print.print_job_status"