channel: subprocess: Kill unresponsive subprocesses

Rahix · Sep 21, 2023 · c691f21 · c691f21
1 parent 5f36a57
commit c691f21
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tbot/machine/channel/subprocess.py b/tbot/machine/channel/subprocess.py
@@ -104,7 +104,11 @@ def close(self) -> None:
         self.p.terminate()
         os.close(self.pty_slave)
         os.close(self.pty_master)
-        self.p.wait()
+        try:
+            self.p.communicate(timeout=10)
+        except subprocess.TimeoutExpired:
+            self.p.kill()
+            self.p.communicate()
 
         # Wait for all processes in the session to end.  Most of the time
         # this will return immediately, but in some cases (eg. a serial session