gh-128364: Fix flaky test_concurrent_futures.test_wait tests
#130742
Merged
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
Use events instead of relying on `time.sleep()`. The tests are also now about four times faster.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
colesbury
added
the
🔨 test-with-refleak-buildbots
This comment was marked as resolved.
This comment was marked as resolved.
bedevere-bot
removed
the
🔨 test-with-refleak-buildbots
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
picnixz
reviewed
Mar 2, 2025
Comment on lines
+112
to
+113
| event = self.create_event() | ||
| future1 = self.executor.submit(event.wait) |
There was a problem hiding this comment.
Not sure if it could be more helpful, but what about using self.addCleanup(event.set) and self.addCleanup(future1.result) here?
There was a problem hiding this comment.
Cleanup functions are called too late. They run after tearDown() where we shutdown the executor and manager.
| @@ -50,14 +51,19 @@ def setUp(self): | |||
| max_workers=self.worker_count, | |||
| mp_context=self.get_context(), | |||
| **self.executor_kwargs) | |||
| self.manager = multiprocessing.Manager() | |||
There was a problem hiding this comment.
Why using multiprocessing.Manager() and not self.get_context().Manager() actually?
There was a problem hiding this comment.
I switched to self.get_context().Manager().
vstinner
reviewed
Mar 5, 2025
| @@ -42,8 +42,12 @@ def test_first_completed(self): | |||
| self.assertEqual(set([future1]), done) | |||
| self.assertEqual(set([CANCELLED_FUTURE, future2]), not_done) | |||
|
|
|||
| event.set() | |||
There was a problem hiding this comment.
Use maybe try/finally to unblock the task on test failure? Same remark for other tests.
| @@ -67,9 +84,14 @@ def test_first_exception(self): | |||
| self.assertEqual(set([future1, future2]), finished) | |||
| self.assertEqual(set([future3]), pending) | |||
|
|
|||
| t.join() | |||
There was a problem hiding this comment.
Use maybe threading_helper.join_thread(t) (from test.support.threading_helper) to not wait forever if something goes wrong.
vstinner
approved these changes
Mar 6, 2025
|
!buildbot iOS |
|
🤖 New build scheduled with the buildbot fleet by @colesbury for commit 0a94b54 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F130742%2Fmerge The command will test the builders whose names match following regular expression: The builders matched are:
|
|
Thanks @colesbury for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13. |
|
Sorry, @colesbury, I could not cleanly backport this to |
colesbury
added a commit
to colesbury/cpython
that referenced
this pull request
Mar 6, 2025
… tests (pythongh-130742) Use events instead of relying on `time.sleep()`. The tests are also now about four times faster. (cherry picked from commit c4d37ee) Co-authored-by: Sam Gross <[email protected]>
|
GH-130922 is a backport of this pull request to the 3.13 branch. |
colesbury
added a commit
that referenced
this pull request
Mar 6, 2025
…gh-130742) (#130922) Use events instead of relying on `time.sleep()`. The tests are also now about four times faster. (cherry picked from commit c4d37ee)
|
seehwan
pushed a commit
to seehwan/cpython
that referenced
this pull request
Apr 16, 2025
…ythongh-130742) Use events instead of relying on `time.sleep()`. The tests are also now about four times faster.
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.
Use events instead of relying on
time.sleep(). The tests are also now about four times faster.test_concurrent_futures.test_wait.ThreadPoolWaitTests.test_timeoutflakes frequently on free-threaded Windows x64 #128364