Issue #20311: selector.PollSelector.select() now rounds the timeout away from

zero, instead of rounding towards zero. For example, a timeout of one
microsecond is now rounded to one millisecond, instead of being rounded to
zero.

Move also a test in test_epoll which was moved by my previous merge.

1 files changed, 11 insertions, 12 deletions

diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
index 22e9896..094b0f0 100644
--- a/Lib/test/test_epoll.py
+++ b/Lib/test/test_epoll.py
@@ -47,18 +47,6 @@ class TestEPoll(unittest.TestCase):
         self.serverSocket.listen(1)
         self.connections = [self.serverSocket]
 
-    def test_timeout_rounding(self):
-        # epoll_wait() has a resolution of 1 millisecond, check if the timeout
-        # is correctly rounded to the upper bound
-        epoll = select.epoll()
-        self.addCleanup(epoll.close)
-        for timeout in (1e-2, 1e-3, 1e-4):
-            t0 = time.perf_counter()
-            epoll.poll(timeout)
-            dt = time.perf_counter() - t0
-            self.assertGreaterEqual(dt, timeout)
-
-
     def tearDown(self):
         for skt in self.connections:
             skt.close()
@@ -266,6 +254,17 @@ class TestEPoll(unittest.TestCase):
         self.addCleanup(epoll.close)
         self.assertEqual(os.get_inheritable(epoll.fileno()), False)
 
+    def test_timeout_rounding(self):
+        # epoll_wait() has a resolution of 1 millisecond, check if the timeout
+        # is correctly rounded to the upper bound
+        epoll = select.epoll()
+        self.addCleanup(epoll.close)
+        for timeout in (1e-2, 1e-3, 1e-4):
+            t0 = time.perf_counter()
+            epoll.poll(timeout)
+            dt = time.perf_counter() - t0
+            self.assertGreaterEqual(dt, timeout)
+
 
 def test_main():
     support.run_unittest(TestEPoll)