upped coverage

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

Author: chipspeak

src/codeflare_sdk/ray/rayjobs/test_rayjob.py

@@ -93,10 +93,10 @@ def test_rayjob_init_validation_both_provided(mocker):
     """Test that providing both cluster_name and cluster_config raises error."""
     # Mock kubernetes config loading
     mocker.patch("kubernetes.config.load_kube_config")
-
+    
     # Mock the RayjobApi class entirely
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
-
+    
     cluster_config = ClusterConfiguration(name="test-cluster", namespace="test")
 
     with pytest.raises(
@@ -114,10 +114,10 @@ def test_rayjob_init_validation_neither_provided(mocker):
     """Test that providing neither cluster_name nor cluster_config raises error."""
     # Mock kubernetes config loading (though this should fail before reaching it)
     mocker.patch("kubernetes.config.load_kube_config")
-
+    
     # Mock the RayjobApi class entirely (though this should fail before reaching it)
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
-
+    
     with pytest.raises(
         ValueError, match="Either cluster_name or cluster_config must be provided"
     ):
@@ -128,10 +128,10 @@ def test_rayjob_init_with_cluster_config(mocker):
     """Test RayJob initialization with cluster configuration for auto-creation."""
     # Mock kubernetes config loading
     mocker.patch("kubernetes.config.load_kube_config")
-
+    
     # Mock the RayjobApi class entirely
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
-
+    
     cluster_config = ClusterConfiguration(
         name="auto-cluster", namespace="test-namespace", num_workers=2
     )
@@ -152,10 +152,10 @@ def test_rayjob_cluster_name_generation(mocker):
     """Test that cluster names are generated when config has empty name."""
     # Mock kubernetes config loading
     mocker.patch("kubernetes.config.load_kube_config")
-
+    
     # Mock the RayjobApi class entirely
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
-
+    
     cluster_config = ClusterConfiguration(
         name="",  # Empty name should trigger generation
         namespace="test-namespace",
@@ -170,11 +170,77 @@ def test_rayjob_cluster_name_generation(mocker):
     assert cluster_config.name == "my-job-cluster"  # Should be updated
 
 
+def test_rayjob_cluster_config_namespace_none(mocker):
+    """Test that cluster config namespace is set when None."""
+    # Mock kubernetes config loading
+    mocker.patch("kubernetes.config.load_kube_config")
+    
+    # Mock the RayjobApi class entirely
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    
+    cluster_config = ClusterConfiguration(
+        name="test-cluster",
+        namespace=None,  # This should be set to job namespace
+        num_workers=1,
+    )
+
+    rayjob = RayJob(
+        job_name="test-job", 
+        cluster_config=cluster_config, 
+        namespace="job-namespace",
+        entrypoint="python script.py"
+    )
+
+    assert cluster_config.namespace == "job-namespace"
+    assert rayjob.namespace == "job-namespace"
+
+
+def test_rayjob_with_active_deadline_seconds(mocker):
+    """Test RayJob CR generation with active deadline seconds."""
+    # Mock kubernetes config loading
+    mocker.patch("kubernetes.config.load_kube_config")
+    
+    # Mock the RayjobApi class entirely
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    
+    rayjob = RayJob(
+        job_name="test-job",
+        cluster_name="test-cluster",
+        namespace="test-namespace",
+        entrypoint="python main.py",
+        active_deadline_seconds=30,  
+    )
+
+    rayjob_cr = rayjob._build_rayjob_cr()
+
+    assert rayjob_cr["spec"]["activeDeadlineSeconds"] == 30
+
+
+def test_build_ray_cluster_spec_no_config_error(mocker):
+    """Test _build_ray_cluster_spec raises error when no cluster config."""
+    # Mock kubernetes config loading
+    mocker.patch("kubernetes.config.load_kube_config")
+    
+    # Mock the RayjobApi class entirely
+    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
+    
+    # Create RayJob with cluster_name (no cluster_config)
+    rayjob = RayJob(
+        job_name="test-job",
+        cluster_name="existing-cluster",
+        entrypoint="python script.py",
+    )
+
+    # Line 198: Should raise RuntimeError when trying to build spec without config
+    with pytest.raises(RuntimeError, match="No cluster configuration provided"):
+        rayjob._build_ray_cluster_spec()
+
+
 @patch("codeflare_sdk.ray.rayjobs.rayjob.build_ray_cluster")
 def test_build_ray_cluster_spec(mock_build_ray_cluster, mocker):
     """Test _build_ray_cluster_spec method."""
     mocker.patch("kubernetes.config.load_kube_config")
-
+    
     # Mock the RayjobApi class entirely
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
 
@@ -216,7 +282,7 @@ def test_build_ray_cluster_spec(mock_build_ray_cluster, mocker):
 def test_build_rayjob_cr_with_existing_cluster(mocker):
     """Test _build_rayjob_cr method with existing cluster."""
     mocker.patch("kubernetes.config.load_kube_config")
-
+    
     # Mock the RayjobApi class entirely
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
 
@@ -251,7 +317,7 @@ def test_build_rayjob_cr_with_existing_cluster(mocker):
 def test_build_rayjob_cr_with_auto_cluster(mock_build_ray_cluster, mocker):
     """Test _build_rayjob_cr method with auto-created cluster."""
     mocker.patch("kubernetes.config.load_kube_config")
-
+    
     # Mock the RayjobApi class entirely
     mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
 
@@ -304,9 +370,6 @@ def test_submit_with_auto_cluster(mock_build_ray_cluster, mocker):
     """Test successful submission with auto-created cluster."""
     mocker.patch("kubernetes.config.load_kube_config")
 
-    # Mock the RayjobApi class entirely
-    mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
-
     mock_ray_cluster = {
         "apiVersion": "ray.io/v1",
         "kind": "RayCluster",