Revert "aider: Refactor run_unit_tests to kill the subprocess when it times out."

This reverts commit 6632367978.

benchmark/benchmark.py

@@ -374,18 +374,23 @@ def run_unit_tests(testdir, history_fname):
         ]
         print(" ".join(command))
 
-        with subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True) as proc:
+        try:
-            try:
+            result = subprocess.run(
-                stdout, _ = proc.communicate(timeout=timeout)
+                command,
-                if proc.returncode != 0:
+                stdout=subprocess.PIPE,
-                    all_tests_passed = False
+                stderr=subprocess.STDOUT,
-                    print(f"Test {test_file} failed")
+                text=True,
-                res = cleanup_test_output(stdout)
+                timeout=timeout,
-            except subprocess.TimeoutExpired:
+            )
-                proc.kill()
+            if result.returncode != 0:
-                proc.wait()
                 all_tests_passed = False
-                res = f"Test {test_file} timed out after {timeout} seconds."
+                print(f"Test {test_file} failed")
+
+            res = cleanup_test_output(result.stdout)
+
+        except subprocess.TimeoutExpired:
+            all_tests_passed = False
+            res = f"Test {test_file} timed out after {timeout} seconds."
 
         with history_fname.open("a") as fh:
             fh.write(f"```\n{res}\n```")