[Python-checkins] cpython (3.3): Issue #20311: Try to fix the unit test, use time.monotonic() instead of

Tue Jan 21 02:38:50 CET 2014

http://hg.python.org/cpython/rev/e1619465c49d
changeset: 88595:e1619465c49d
branch: 3.3
parent: 88592:033137c12d88
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Jan 21 02:37:41 2014 +0100
summary:
 Issue #20311: Try to fix the unit test, use time.monotonic() instead of
time.perf_counter()
Move also the unit test at the end.
files:
 Lib/test/test_epoll.py | 24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
--- a/Lib/test/test_epoll.py
+++ b/Lib/test/test_epoll.py
@@ -46,18 +46,6 @@
 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 @@
 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)
 
-- 
Repository URL: http://hg.python.org/cpython
