From 39d798eb03e2f389b9d59d005a14eed1467f18cd Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 21 Jan 2014 02:37:41 +0100
Subject: Issue #20311: Try to fix the unit test, use time.monotonic() instead
 of time.perf_counter()

Move also the unit test at the end.
---
 Lib/test/test_epoll.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
index ad545d3..46d2968 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)
 
-- 
cgit v0.12