summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-01-21 01:37:41 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-01-21 01:37:41 (GMT)
commit39d798eb03e2f389b9d59d005a14eed1467f18cd (patch)
treea8e5098033e25ae5bd0f2bc8b14101f93f085644
parent665486e0e73f6e1cc0a54d1ac1e977b7cff7b085 (diff)
downloadcpython-39d798eb03e2f389b9d59d005a14eed1467f18cd.zip
cpython-39d798eb03e2f389b9d59d005a14eed1467f18cd.tar.gz
cpython-39d798eb03e2f389b9d59d005a14eed1467f18cd.tar.bz2
Issue #20311: Try to fix the unit test, use time.monotonic() instead of
time.perf_counter() Move also the unit test at the end.
-rw-r--r--Lib/test/test_epoll.py24
1 files 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)