mock skydriver.k8s.scanner_instance.SkymapScannerStopperJob.do_job

WIPACrepo · Jun 13, 2023 · 89b6536 · 89b6536
1 parent f0b8620
commit 89b6536
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/skydriver/k8s/scanner_instance.py b/skydriver/k8s/scanner_instance.py
@@ -331,7 +331,7 @@ def __init__(
             ENV.K8S_NAMESPACE,
         )
 
-    def start_job(self) -> Any:
+    def do_job(self) -> Any:
         """Start the k8s job."""
 
         # TODO: stop first k8s job (server & clientmanager-starter)

diff --git a/skydriver/rest_handlers.py b/skydriver/rest_handlers.py
@@ -344,7 +344,7 @@ async def stop_scanner_instance(
     )
 
     try:
-        k8s_job.start_job()
+        k8s_job.do_job()
     except kubernetes.client.exceptions.ApiException as e:
         LOGGER.exception(e)
         raise web.HTTPError(

diff --git a/tests/integration/test_backlog_runner.py b/tests/integration/test_backlog_runner.py
@@ -88,6 +88,7 @@ def client() -> RestClient:
 N_JOBS = 5
 
 
+@mock.patch("skydriver.k8s.scanner_instance.SkymapScannerStopperJob.do_job", new=Mock())
 @mock.patch("skydriver.k8s.utils.KubeAPITools.start_job")
 async def test_00(kapitsj_mock: Mock, server: Callable[[], RestClient]) -> None:
     """Test backlog job starting."""
@@ -102,6 +103,7 @@ async def test_00(kapitsj_mock: Mock, server: Callable[[], RestClient]) -> None:
     print_it(await rc.request("GET", "/scans/backlog"))
 
 
+@mock.patch("skydriver.k8s.scanner_instance.SkymapScannerStopperJob.do_job", new=Mock())
 @mock.patch("skydriver.k8s.utils.KubeAPITools.start_job")
 async def test_01(kapitsj_mock: Mock, server: Callable[[], RestClient]) -> None:
     """Test backlog job starting with multiple."""
@@ -125,6 +127,7 @@ async def test_01(kapitsj_mock: Mock, server: Callable[[], RestClient]) -> None:
     print_it(await rc.request("GET", "/scans/backlog"))
 
 
+@mock.patch("skydriver.k8s.scanner_instance.SkymapScannerStopperJob.do_job", new=Mock())
 @mock.patch("skydriver.k8s.utils.KubeAPITools.start_job")
 async def test_10(
     kapitsj_mock: Mock,