gh-126499: test_ssl: Don't assume err.reason is a string (GH-126501) · ebonnal/cpython@538ea9a · GitHub

1. ebonnal
2. cpython

Repository navigation

• Code
• Pull requests1 (1)
• Actions
• Projects
• Security and quality
• Insights

Commit 538ea9a

Browse filesBrowse the repository at this point in the historyBrowse files

encukou

authored and

ebonnal

committed

pythongh-126499: test_ssl: Don't assume err.reason is a string (pythonGH-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.

1 parent d75f400 commit 538ea9a
Copy full SHA for 538ea9a

1 file changed

+1-1Lines changed: 1 addition & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib/test
  • test_ssl.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/test/test_ssl.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_ssl.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -5029,7 +5029,7 @@ def non_linux_skip_if_other_okay_error(self, err):
5029	5029	return # Expect the full test setup to always work on Linux.
5030	5030	if (isinstance(err, ConnectionResetError) or
5031	5031	(isinstance(err, OSError) and err.errno == errno.EINVAL) or
5032		- re.search('wrong.version.number', getattr(err, "reason", ""), re.I)):
	5032	+ re.search('wrong.version.number', str(getattr(err, "reason", "")), re.I)):
5033	5033	# On Windows the TCP RST leads to a ConnectionResetError
5034	5034	# (ECONNRESET) which Linux doesn't appear to surface to userspace.
5035	5035	# If wrap_socket() winds up on the "if connected:" path and doing

0 commit comments

Comments

0 (0)