gh-126483: disable warnings filters mutation in concurrent test_check… #132694
+31
−12
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…_check_hostname_idn use by test_ssl_in_multiple_threads
graingert
commented
Apr 18, 2025
graingert
commented
Apr 18, 2025
gpshead
approved these changes
Apr 18, 2025
graingert
commented
Apr 19, 2025
picnixz
reviewed
Apr 27, 2025
Lib/test/test_ssl.py
Outdated
Comment on lines
3160
to
3179
| with ( | ||
| ThreadedEchoServer(context=server_context, chatty=True) as server, | ||
| warnings_helper.check_no_resource_warning(self) | ||
| if warnings_filters | ||
| else nullcontext(), | ||
| self.assertRaises(UnicodeError), | ||
| ): | ||
| context.wrap_socket(socket.socket(), server_hostname='.pythontest.net') | ||
|
|
||
| with ( | ||
| ThreadedEchoServer(context=server_context, chatty=True) as server, | ||
| warnings_helper.check_no_resource_warning(self) | ||
| if warnings_filters | ||
| else nullcontext(), | ||
| self.assertRaises(UnicodeDecodeError), | ||
| ): | ||
| context.wrap_socket( | ||
| socket.socket(), | ||
| server_hostname=b'k\xf6nig.idn.pythontest.net', | ||
| ) |
There was a problem hiding this comment.
I suggest the following:
def get_warnings_filter_context(self, warnings_filter):
if warnings_filters:
return warnings_helper.check_no_resource_warning(self)
return nullcontext()so that it can be used as follows:
with (
ThreadedEchoServer(context=server_context, chatty=True) as server,
self.get_warnings_filter_context(warnings_filters),
self.assertRaises(UnicodeError),
):
context.wrap_socket(socket.socket(), server_hostname='.pythontest.net')
with (
ThreadedEchoServer(context=server_context, chatty=True) as server,
self.get_warnings_filter_context(warnings_filters),
self.assertRaises(UnicodeDecodeError),
):
context.wrap_socket(
socket.socket(),
server_hostname=b'k\xf6nig.idn.pythontest.net',
)It took me a while to see the ternary if-else
There was a problem hiding this comment.
I'll add some extra parenthesis, like ruff would
picnixz
approved these changes
Apr 30, 2025
|
Thanks @graingert for the PR, and @colesbury for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jun 4, 2025
…pythonGH-132694) The `test_ssl_in_multiple_threads` test failed because `test_check_hostname_idn()` modified the global warnings filters via `warnings_helper.check_no_resource_warning()`. Only check for warnings when the context aware warnings feature is enabled, which makes the warnings filter context-local and thread-safe. (cherry picked from commit 40c8be0) Co-authored-by: Thomas Grainger <tagrain@gmail.com>
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jun 4, 2025
…pythonGH-132694) The `test_ssl_in_multiple_threads` test failed because `test_check_hostname_idn()` modified the global warnings filters via `warnings_helper.check_no_resource_warning()`. Only check for warnings when the context aware warnings feature is enabled, which makes the warnings filter context-local and thread-safe. (cherry picked from commit 40c8be0) Co-authored-by: Thomas Grainger <tagrain@gmail.com>
|
GH-135131 is a backport of this pull request to the 3.14 branch. |
|
GH-135132 is a backport of this pull request to the 3.13 branch. |
colesbury
pushed a commit
that referenced
this pull request
Jun 4, 2025
GH-132694) (GH-135131) The `test_ssl_in_multiple_threads` test failed because `test_check_hostname_idn()` modified the global warnings filters via `warnings_helper.check_no_resource_warning()`. Only check for warnings when the context aware warnings feature is enabled, which makes the warnings filter context-local and thread-safe. (cherry picked from commit 40c8be0) Co-authored-by: Thomas Grainger <tagrain@gmail.com>
colesbury
added a commit
that referenced
this pull request
Jun 4, 2025
GH-132694) (GH-135132) The `test_ssl_in_multiple_threads` test failed because `test_check_hostname_idn()` modified the global warnings filters via `warnings_helper.check_no_resource_warning()`. Disable the warnings check in the multi-threaded test because `warnings_helper` isn't thread-safe in 3.13 or earlier. (cherry picked from commit 40c8be0) Co-authored-by: Thomas Grainger <tagrain@gmail.com> * Fix for 3.13 --------- Co-authored-by: Thomas Grainger <tagrain@gmail.com> Co-authored-by: Sam Gross <colesbury@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…_hostname_idn use by test_ssl_in_multiple_threads