diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-07-25 13:43:11 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-25 13:43:11 (GMT) |
| commit | e788c0aeeb46bdfa3c4d8a39fb9bbb505e6d27a8 (patch) | |
| tree | e8f84b79bf1b2aaf47bf1ee165311a1a226b85c5 | |
| parent | 0cf5f6a6db0c50e46687de1fd99f90d7f85f69ea (diff) | |
| download | cpython-e788c0aeeb46bdfa3c4d8a39fb9bbb505e6d27a8.zip cpython-e788c0aeeb46bdfa3c4d8a39fb9bbb505e6d27a8.tar.gz cpython-e788c0aeeb46bdfa3c4d8a39fb9bbb505e6d27a8.tar.bz2 | |
[3.12] gh-107237: Fix test_udp_reconnection() of test_logging (GH-107238) (#107242)
gh-107237: Fix test_udp_reconnection() of test_logging (GH-107238)
test_logging: Fix test_udp_reconnection() by increasing the timeout
from 100 ms to 5 minutes (LONG_TIMEOUT).
Replace also blocking wait() with wait(LONG_TIMEOUT) in
test_output() to prevent the test to hang.
(cherry picked from commit ed082383272c2c238e364e9cc83229234aee23cc)
Co-authored-by: Victor Stinner <vstinner@python.org>
| -rw-r--r-- | Lib/test/test_logging.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2023-07-25-14-36-33.gh-issue-107237.y1pY79.rst | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 18258c2..def976f 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -2079,17 +2079,17 @@ class SysLogHandlerTest(BaseTest): # The log message sent to the SysLogHandler is properly received. logger = logging.getLogger("slh") logger.error("sp\xe4m") - self.handled.wait() + self.handled.wait(support.LONG_TIMEOUT) self.assertEqual(self.log_output, b'<11>sp\xc3\xa4m\x00') self.handled.clear() self.sl_hdlr.append_nul = False logger.error("sp\xe4m") - self.handled.wait() + self.handled.wait(support.LONG_TIMEOUT) self.assertEqual(self.log_output, b'<11>sp\xc3\xa4m') self.handled.clear() self.sl_hdlr.ident = "h\xe4m-" logger.error("sp\xe4m") - self.handled.wait() + self.handled.wait(support.LONG_TIMEOUT) self.assertEqual(self.log_output, b'<11>h\xc3\xa4m-sp\xc3\xa4m') def test_udp_reconnection(self): @@ -2097,7 +2097,7 @@ class SysLogHandlerTest(BaseTest): self.sl_hdlr.close() self.handled.clear() logger.error("sp\xe4m") - self.handled.wait(0.1) + self.handled.wait(support.LONG_TIMEOUT) self.assertEqual(self.log_output, b'<11>sp\xc3\xa4m\x00') @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required") diff --git a/Misc/NEWS.d/next/Tests/2023-07-25-14-36-33.gh-issue-107237.y1pY79.rst b/Misc/NEWS.d/next/Tests/2023-07-25-14-36-33.gh-issue-107237.y1pY79.rst new file mode 100644 index 0000000..a04f7ee --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2023-07-25-14-36-33.gh-issue-107237.y1pY79.rst @@ -0,0 +1,2 @@ +``test_logging``: Fix ``test_udp_reconnection()`` by increasing the timeout +from 100 ms to 5 minutes (LONG_TIMEOUT). Patch by Victor Stinner. |