Modify windows kill to go after tree

ayjayt · ayjayt · commit 65a96806b070 · 2025-01-29T00:20:43.000-05:00
diff --git a/choreographer/utils/_kill.py b/choreographer/utils/_kill.py
@@ -7,7 +7,7 @@
 def kill(process: subprocess.Popen[bytes]) -> None:
     if platform.system() == "Windows":
         subprocess.call(  # noqa: S603, false positive, input fine
-            ["taskkill", "/F", "/T", "/PID", str(process.pid)],  # noqa: S607 windows full path...
+            ["taskkill", "/IM", "/F", "/T", "/PID", str(process.pid)],  # noqa: S607 windows full path...
             stderr=subprocess.DEVNULL,
             stdout=subprocess.DEVNULL,
         )
diff --git a/tests/test_process.py b/tests/test_process.py
@@ -77,7 +77,7 @@ async def test_watchdog(headless):
     if platform.system() == "Windows":
         # Blocking process here because it ensures the kill will occur rn
         subprocess.call(  # noqa: S603, ASYNC221 sanitize input, blocking process
-            ["taskkill", "/F", "/T", "/PID", str(browser.subprocess.pid)],  # noqa: S607
+            ["taskkill", "/IM", "/F", "/T", "/PID", str(browser.subprocess.pid)],  # noqa: S607
             stderr=subprocess.DEVNULL,
             stdout=subprocess.DEVNULL,
         )

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`def kill(process: subprocess.Popen[bytes]) -> None:`
`8`	`8`	`if platform.system() == "Windows":`
`9`	`9`	`subprocess.call( # noqa: S603, false positive, input fine`
`10`		`- ["taskkill", "/F", "/T", "/PID", str(process.pid)], # noqa: S607 windows full path...`
	`10`	`+ ["taskkill", "/IM", "/F", "/T", "/PID", str(process.pid)], # noqa: S607 windows full path...`
`11`	`11`	`stderr=subprocess.DEVNULL,`
`12`	`12`	`stdout=subprocess.DEVNULL,`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ async def test_watchdog(headless):`
`77`	`77`	`if platform.system() == "Windows":`
`78`	`78`	`# Blocking process here because it ensures the kill will occur rn`
`79`	`79`	`subprocess.call( # noqa: S603, ASYNC221 sanitize input, blocking process`
`80`		`- ["taskkill", "/F", "/T", "/PID", str(browser.subprocess.pid)], # noqa: S607`
	`80`	`+ ["taskkill", "/IM", "/F", "/T", "/PID", str(browser.subprocess.pid)], # noqa: S607`
`81`	`81`	`stderr=subprocess.DEVNULL,`
`82`	`82`	`stdout=subprocess.DEVNULL,`
`83`	`83`	`)`