bpo-35347: Fix test_socket.NonBlockingTCPTests #10791
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
|
cc @pablogsal FYI ;-) |
vstinner
changed the title
testAccept() and testRecv() of test_socket.NonBlockingTCPTests have a race condition: time.sleep() is used as a weak synchronization primitive and the tests fail randomly on slow buildbots. Fix these tests using a reliable threading.Event. Changes: * Replace send() with sendall() * Expect specific BlockingIOError rather than generic OSError * Add a timeout to testAccept() and testRecv() select * Use addCleanup() and context manager to close sockets * Use assertLess() and assertRaises()
|
@1st1, @pablogsal: I wrote a larger change than I expected to enhance and fix test_socket.NonBlockingTCPTests. Would you mind to review this change? First, I wrote a much larger change to "cleanup" the whole test case. Since I would like to apply this fix to 2.7, 3.6 and 3.7, I rewrote the change to have a "minimum" fix for testAccept() and testRecv(). Once the fix will be merged, I will write a second "cleanup" PR specific to master. |
This change should be backported to 2.7, but I will backport it manually since BlockingIOError must be written differently in Python 2.7. |
|
Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Nov 30, 2018
testAccept() and testRecv() of test_socket.NonBlockingTCPTests have a race condition: time.sleep() is used as a weak synchronization primitive and the tests fail randomly on slow buildbots. Use a reliable threading.Event to fix these tests. Other changes: * Replace send() with sendall() * Expect specific BlockingIOError rather than generic OSError * Add a timeout to select() in testAccept() and testRecv() * Use addCleanup() to close sockets * Use assertRaises() (cherry picked from commit ebd5d6d) Co-authored-by: Victor Stinner <vstinner@redhat.com>
|
GH-10815 is a backport of this pull request to the 3.7 branch. |
|
GH-10816 is a backport of this pull request to the 3.6 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Nov 30, 2018
testAccept() and testRecv() of test_socket.NonBlockingTCPTests have a race condition: time.sleep() is used as a weak synchronization primitive and the tests fail randomly on slow buildbots. Use a reliable threading.Event to fix these tests. Other changes: * Replace send() with sendall() * Expect specific BlockingIOError rather than generic OSError * Add a timeout to select() in testAccept() and testRecv() * Use addCleanup() to close sockets * Use assertRaises() (cherry picked from commit ebd5d6d) Co-authored-by: Victor Stinner <vstinner@redhat.com>
|
I'm sorry, I am impatient :-( I reviewed again my code and then I merged it my fix to make CIs more reliable. |
miss-islington
added a commit
that referenced
this pull request
Nov 30, 2018
testAccept() and testRecv() of test_socket.NonBlockingTCPTests have a race condition: time.sleep() is used as a weak synchronization primitive and the tests fail randomly on slow buildbots. Use a reliable threading.Event to fix these tests. Other changes: * Replace send() with sendall() * Expect specific BlockingIOError rather than generic OSError * Add a timeout to select() in testAccept() and testRecv() * Use addCleanup() to close sockets * Use assertRaises() (cherry picked from commit ebd5d6d) Co-authored-by: Victor Stinner <vstinner@redhat.com>
miss-islington
added a commit
that referenced
this pull request
Nov 30, 2018
testAccept() and testRecv() of test_socket.NonBlockingTCPTests have a race condition: time.sleep() is used as a weak synchronization primitive and the tests fail randomly on slow buildbots. Use a reliable threading.Event to fix these tests. Other changes: * Replace send() with sendall() * Expect specific BlockingIOError rather than generic OSError * Add a timeout to select() in testAccept() and testRecv() * Use addCleanup() to close sockets * Use assertRaises() (cherry picked from commit ebd5d6d) Co-authored-by: Victor Stinner <vstinner@redhat.com>
vstinner
added a commit
that referenced
this pull request
Nov 30, 2018
testAccept() and testRecv() of test_socket.NonBlockingTCPTests have a race condition: time.sleep() is used as a weak synchronization primitive and the tests fail randomly on slow buildbots. Use a reliable threading.Event to fix these tests. Other changes: * Replace send() with sendall() * Add a timeout to select() in testAccept() and testRecv() * Use addCleanup() to close sockets * Use assertRaises() (cherry picked from commit ebd5d6d)
|
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.
testAccept() and testRecv() of test_socket.NonBlockingTCPTests have a
race condition: time.sleep() is used as a weak synchronization
primitive and the tests fail randomly on slow buildbots. Fix these
tests using a reliable threading.Event.
Changes:
https://bugs.python.org/issue35347