Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.11] gh-102795: Fix use of poll in test_epoll's test_control_and_wait (GH-102796) #104173

Closed
wants to merge 2 commits into from
Closed

[3.11] gh-102795: Fix use of poll in test_epoll's test_control_and_wait (GH-102796) #104173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6fe710
gh-102795: Fix use of poll in test_epoll's test_control_and_wait (GH-…
kevinGC May 4, 2023
4c0d41b
Merge branch '3.11' into backport-c9ecd3e-3.11
iritkatriel May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions Lib/test/test_epoll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import socket
import time
import unittest
from test import support

if not hasattr(select, "epoll"):
raise unittest.SkipTest("test works only on Linux 2.6")
Expand Down Expand Up @@ -186,10 +187,16 @@ def test_control_and_wait(self):
client.sendall(b"Hello!")
server.sendall(b"world!!!")

now = time.monotonic()
events = ep.poll(1.0, 4)
then = time.monotonic()
self.assertFalse(then - now > 0.01)
# we might receive events one at a time, necessitating multiple calls to
# poll
events = []
for _ in support.busy_retry(support.SHORT_TIMEOUT):
now = time.monotonic()
events += ep.poll(1.0, 4)
then = time.monotonic()
self.assertFalse(then - now > 0.01)
if len(events) >= 2:
break

expected = [(client.fileno(), select.EPOLLIN | select.EPOLLOUT),
(server.fileno(), select.EPOLLIN | select.EPOLLOUT)]
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Tests/2023-03-17-22-00-47.gh-issue-102795.z21EoC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix use of poll in test_epoll's test_control_and_wait