pytest twister harness: increase timeout when stopping subprocess

When running pytest tests with coverage enabled, the test process starts
to write the coverage data when it receives the SIGTERM signal. On slow
machines, this can take longer than 0.5s. Increase the timeout and only
attempt to kill the process if it is still running after the timeout.

Signed-off-by: Marco Widmer <marco.widmer@bytesatwork.ch>

Author: marcowidmer

scripts/pylib/pytest-twister-harness/src/twister_harness/device/binary_adapter.py

@@ -81,7 +81,7 @@ def _stop_subprocess(self) -> None:
             return
         return_code: int | None = self._process.poll()
         if return_code is None:
-            terminate_process(self._process)
+            terminate_process(self._process, self.base_timeout)
             return_code = self._process.wait(self.base_timeout)
         self._process = None
         logger.debug('Running subprocess finished with return code %s', return_code)

scripts/pylib/pytest-twister-harness/src/twister_harness/device/utils.py

@@ -11,7 +11,6 @@
 import shlex
 import signal
 import subprocess
-import time
 
 import psutil
 
@@ -38,7 +37,7 @@ def log_command(logger: logging.Logger, msg: str, args: list, level: int = loggi
         logger.log(level, msg, shlex.join(args))
 
 
-def terminate_process(proc: subprocess.Popen) -> None:
+def terminate_process(proc: subprocess.Popen, timeout: float = 0.5) -> None:
     """
     Try to terminate provided process and all its subprocesses recursively.
     """
@@ -47,6 +46,7 @@ def terminate_process(proc: subprocess.Popen) -> None:
             with contextlib.suppress(ProcessLookupError, psutil.NoSuchProcess):
                 os.kill(child.pid, signal.SIGTERM)
     proc.terminate()
-    # sleep for a while before attempting to kill
-    time.sleep(0.5)
-    proc.kill()
+    try:
+        proc.wait(timeout=timeout)
+    except subprocess.TimeoutExpired:
+        proc.kill()