@@ -1199,15 +1199,6 @@ def start_worker(
1199
1199
self .processes .append (p )
1200
1200
return p
1201
1201
1202
- @staticmethod
1203
- def _get_ctrl_c_signal () -> int :
1204
- """
1205
- Windows uses a different signal for CTRL-C than Unix.
1206
- """
1207
- if hasattr (signal , "CTRL_C_EVENT" ):
1208
- return cast (int , signal .CTRL_C_EVENT )
1209
- return signal .SIGINT
1210
-
1211
1202
def test_run_subprocess (self ) -> None :
1212
1203
result = test_tasks .noop_task .enqueue ()
1213
1204
process = self .start_worker (["--batch" ])
@@ -1232,7 +1223,7 @@ def test_interrupt_no_tasks(self) -> None:
1232
1223
1233
1224
def test_interrupt_signals (self ) -> None :
1234
1225
for sig in [
1235
- self . _get_ctrl_c_signal (),
1226
+ signal . SIGINT , # ctrl-c
1236
1227
signal .SIGTERM ,
1237
1228
]:
1238
1229
with self .subTest (sig ):
@@ -1246,7 +1237,7 @@ def test_interrupt_signals(self) -> None:
1246
1237
result .refresh ()
1247
1238
self .assertEqual (result .status , ResultStatus .RUNNING )
1248
1239
1249
- process . send_signal ( sig )
1240
+ os . kill ( process . pid , sig )
1250
1241
1251
1242
process .wait (timeout = 1 )
1252
1243
@@ -1257,8 +1248,6 @@ def test_interrupt_signals(self) -> None:
1257
1248
self .assertEqual (result .status , ResultStatus .COMPLETE )
1258
1249
1259
1250
def test_repeat_ctrl_c (self ) -> None :
1260
- ctrl_c_signal = self ._get_ctrl_c_signal ()
1261
-
1262
1251
result = test_tasks .hang .enqueue ()
1263
1252
1264
1253
process = self .start_worker ()
@@ -1269,15 +1258,15 @@ def test_repeat_ctrl_c(self) -> None:
1269
1258
result .refresh ()
1270
1259
self .assertEqual (result .status , ResultStatus .RUNNING )
1271
1260
1272
- process . send_signal ( ctrl_c_signal )
1261
+ os . kill ( process . pid , signal . SIGINT )
1273
1262
1274
1263
time .sleep (0.5 )
1275
1264
1276
1265
self .assertIsNone (process .poll ())
1277
1266
result .refresh ()
1278
1267
self .assertEqual (result .status , ResultStatus .RUNNING )
1279
1268
1280
- process . send_signal ( ctrl_c_signal )
1269
+ os . kill ( process . pid , signal . SIGINT )
1281
1270
1282
1271
process .wait (timeout = 2 )
1283
1272
0 commit comments