From 12a5562f921e7e55ecc83ec47616d7ea440e631b Mon Sep 17 00:00:00 2001 From: Jason Wilkes Date: Tue, 1 Feb 2022 11:12:39 -0800 Subject: [PATCH 1/3] Fix bug in timeout kwd of test.support.wait_process --- Lib/test/support/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index f8faa41ad439c4..409399871f2052 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -1999,7 +1999,7 @@ def wait_process(pid, *, exitcode, timeout=None): # process is still running dt = time.monotonic() - t0 - if dt > SHORT_TIMEOUT: + if dt > timeout: try: os.kill(pid, signal.SIGKILL) os.waitpid(pid, 0) From fedb85fc853d4007c33fab5fa3f001c864bd328b Mon Sep 17 00:00:00 2001 From: Jason Wilkes Date: Mon, 7 Feb 2022 13:24:44 -0800 Subject: [PATCH 2/3] Add NEWS.d entry. --- Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst diff --git a/Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst b/Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst new file mode 100644 index 00000000000000..5ce010260893f6 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst @@ -0,0 +1,2 @@ +The function ``wait_process`` in ``Lib/test/support/__init__.py`` no longer +ignores its ``timeout`` argument. From 40dc1cc4dc6ab077a330075a8e252b9c2fe67e02 Mon Sep 17 00:00:00 2001 From: Jason Wilkes Date: Mon, 23 May 2022 11:33:24 -0700 Subject: [PATCH 3/3] Remove NEWS.d entry. --- Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst diff --git a/Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst b/Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst deleted file mode 100644 index 5ce010260893f6..00000000000000 --- a/Misc/NEWS.d/next/Tests/2022-02-07-13-24-28.bpo-46679.S-HI_R.rst +++ /dev/null @@ -1,2 +0,0 @@ -The function ``wait_process`` in ``Lib/test/support/__init__.py`` no longer -ignores its ``timeout`` argument.