From: Petr Viktorin <encukou@gmail.com>
Date: Thu, 7 Nov 2024 10:06:27 +0000 (+0100)
Subject: gh-126499: test_ssl: Don't assume err.reason is a string (GH-126501)
X-Git-Tag: v3.14.0a2~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78ad7e632248dc989378cabeb797b9f3d940d9f2;p=thirdparty%2FPython%2Fcpython.git

gh-126499: test_ssl: Don't assume err.reason is a string (GH-126501)

The skipping machinery called `getattr(err, "reason", "")` on an arbitrary
exception. As intermittent Buildbot failures show, sometimes it's set
to None.

Convert it to string for this specific check.
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index de5110a1cc4b..ca9dac97c8e2 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -5029,7 +5029,7 @@ class TestPreHandshakeClose(unittest.TestCase):
             return  # Expect the full test setup to always work on Linux.
         if (isinstance(err, ConnectionResetError) or
             (isinstance(err, OSError) and err.errno == errno.EINVAL) or
-            re.search('wrong.version.number', getattr(err, "reason", ""), re.I)):
+            re.search('wrong.version.number', str(getattr(err, "reason", "")), re.I)):
             # On Windows the TCP RST leads to a ConnectionResetError
             # (ECONNRESET) which Linux doesn't appear to surface to userspace.
             # If wrap_socket() winds up on the "if connected:" path and doing