From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 21 Jan 2014 01:37:41 +0000 (+0100)
Subject: Issue #20311: Try to fix the unit test, use time.monotonic() instead of
X-Git-Tag: v3.3.4rc1~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39d798eb03e2f389b9d59d005a14eed1467f18cd;p=thirdparty%2FPython%2Fcpython.git

Issue #20311: Try to fix the unit test, use time.monotonic() instead of
time.perf_counter()

Move also the unit test at the end.
---

diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
index ad545d3a3b15..46d2968b093e 100644
--- a/Lib/test/test_epoll.py
+++ b/Lib/test/test_epoll.py
@@ -46,18 +46,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()
@@ -229,6 +217,18 @@ class TestEPoll(unittest.TestCase):
         server.close()
         ep.unregister(fd)
 
+    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.monotonic()
+            epoll.poll(timeout)
+            dt = time.monotonic() - t0
+            self.assertGreaterEqual(dt, timeout)
+
+
 def test_main():
     support.run_unittest(TestEPoll)