Changed returns for delete_jobs and stop_jobs and updated unit tests

Author: Bobbins228

src/codeflare_sdk.egg-info/SOURCES.txt

@@ -14,8 +14,10 @@ src/codeflare_sdk/cluster/config.py
 src/codeflare_sdk/cluster/model.py
 src/codeflare_sdk/job/__init__.py
 src/codeflare_sdk/job/jobs.py
+src/codeflare_sdk/job/ray_jobs.py
 src/codeflare_sdk/utils/__init__.py
 src/codeflare_sdk/utils/generate_cert.py
 src/codeflare_sdk/utils/generate_yaml.py
 src/codeflare_sdk/utils/kube_api_helpers.py
+src/codeflare_sdk/utils/openshift_oauth.py
 src/codeflare_sdk/utils/pretty_print.py

src/codeflare_sdk/job/ray_jobs.py

@@ -68,18 +68,18 @@ def submit_job(
             entrypoint_resources=entrypoint_resources,
         )
 
-    def delete_job(self, job_id: str) -> bool:
+    def delete_job(self, job_id: str) -> (bool, str):
         """
         Method for deleting jobs with the job id being a mandatory field.
         """
         deletion_status = self.rayJobClient.delete_job(job_id=job_id)
 
         if deletion_status:
-            print(f"Successfully deleted Job {job_id}")
-            return deletion_status
+            message = f"Successfully deleted Job {job_id}"
         else:
-            print(f"Failed to delete Job {job_id}")
-            return deletion_status
+            message = f"Failed to delete Job {job_id}"
+
+        return deletion_status, message
 
     def get_address(self) -> str:
         """
@@ -95,7 +95,7 @@ def get_job_info(self, job_id: str):
 
     def get_job_logs(self, job_id: str) -> str:
         """
-        Method for getting the job info with the job id being a mandatory field.
+        Method for getting the job logs with the job id being a mandatory field.
         """
         return self.rayJobClient.get_job_logs(job_id=job_id)
 
@@ -111,16 +111,16 @@ def list_jobs(self):
         """
         return self.rayJobClient.list_jobs()
 
-    def stop_job(self, job_id: str) -> bool:
+    def stop_job(self, job_id: str) -> (bool, str):
         """
         Method for stopping a job with the job id being a mandatory field.
         """
         stop_job_status = self.rayJobClient.stop_job(job_id=job_id)
         if stop_job_status:
-            print(f"Successfully stopped Job {job_id}")
+            message = f"Successfully stopped Job {job_id}"
         else:
-            print(f"Failed to stop Job, {job_id} could have already completed.")
-        return stop_job_status
+            message = f"Failed to stop Job, {job_id} could have already completed."
+        return stop_job_status, message
 
     def tail_job_logs(self, job_id: str) -> Iterator[str]:
         """

tests/unit_test.py

@@ -2890,36 +2890,39 @@ def test_rjc_delete_job(ray_job_client, mocker):
     result = ray_job_client.delete_job(job_id="mocked_job_id")
 
     mocked_delete_job_True.assert_called_once_with(job_id="mocked_job_id")
-    assert result is True
+    assert result == (True, "Successfully deleted Job mocked_job_id")
 
     # Case return False
     mocked_delete_job_False = mocker.patch.object(
-        JobSubmissionClient, "delete_job", return_value=False
+        JobSubmissionClient, "delete_job", return_value=(False)
     )
     result = ray_job_client.delete_job(job_id="mocked_job_id")
 
     mocked_delete_job_False.assert_called_once_with(job_id="mocked_job_id")
-    assert result is False
+    assert result == (False, "Failed to delete Job mocked_job_id")
 
 
 def test_rjc_stop_job(ray_job_client, mocker):
     # Case return True
     mocked_stop_job_True = mocker.patch.object(
-        JobSubmissionClient, "stop_job", return_value=True
+        JobSubmissionClient, "stop_job", return_value=(True)
     )
     result = ray_job_client.stop_job(job_id="mocked_job_id")
 
     mocked_stop_job_True.assert_called_once_with(job_id="mocked_job_id")
-    assert result is True
+    assert result == (True, "Successfully stopped Job mocked_job_id")
 
     # Case return False
     mocked_stop_job_False = mocker.patch.object(
-        JobSubmissionClient, "stop_job", return_value=False
+        JobSubmissionClient, "stop_job", return_value=(False)
     )
     result = ray_job_client.stop_job(job_id="mocked_job_id")
 
     mocked_stop_job_False.assert_called_once_with(job_id="mocked_job_id")
-    assert result is False
+    assert result == (
+        False,
+        "Failed to stop Job, mocked_job_id could have already completed.",
+    )
 
 
 def test_rjc_address(ray_job_client, mocker):