Manually call os.kill to interrupt

This works around an issue with `subprocess` on Windows.
RealOrangeOne · Sep 10, 2024 · a935797 · a935797
1 parent 49ce403
commit a935797
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/tests/tests/test_database_backend.py b/tests/tests/test_database_backend.py
@@ -1199,15 +1199,6 @@ def start_worker(
         self.processes.append(p)
         return p
 
-    @staticmethod
-    def _get_ctrl_c_signal() -> int:
-        """
-        Windows uses a different signal for CTRL-C than Unix.
-        """
-        if hasattr(signal, "CTRL_C_EVENT"):
-            return cast(int, signal.CTRL_C_EVENT)
-        return signal.SIGINT
-
     def test_run_subprocess(self) -> None:
         result = test_tasks.noop_task.enqueue()
         process = self.start_worker(["--batch"])
@@ -1232,7 +1223,7 @@ def test_interrupt_no_tasks(self) -> None:
 
     def test_interrupt_signals(self) -> None:
         for sig in [
-            self._get_ctrl_c_signal(),
+            signal.SIGINT,   # ctrl-c
             signal.SIGTERM,
         ]:
             with self.subTest(sig):
@@ -1246,7 +1237,7 @@ def test_interrupt_signals(self) -> None:
                 result.refresh()
                 self.assertEqual(result.status, ResultStatus.RUNNING)
 
-                process.send_signal(sig)
+                os.kill(process.pid, sig)
 
                 process.wait(timeout=1)
 
@@ -1257,8 +1248,6 @@ def test_interrupt_signals(self) -> None:
                 self.assertEqual(result.status, ResultStatus.COMPLETE)
 
     def test_repeat_ctrl_c(self) -> None:
-        ctrl_c_signal = self._get_ctrl_c_signal()
-
         result = test_tasks.hang.enqueue()
 
         process = self.start_worker()
@@ -1269,15 +1258,15 @@ def test_repeat_ctrl_c(self) -> None:
         result.refresh()
         self.assertEqual(result.status, ResultStatus.RUNNING)
 
-        process.send_signal(ctrl_c_signal)
+        os.kill(process.pid, signal.SIGINT)
 
         time.sleep(0.5)
 
         self.assertIsNone(process.poll())
         result.refresh()
         self.assertEqual(result.status, ResultStatus.RUNNING)
 
-        process.send_signal(ctrl_c_signal)
+        os.kill(process.pid, signal.SIGINT)
 
         process.wait(timeout=2)