changeset: 88596:26c54e9a933b parent: 88594:e042ea77a152 parent: 88595:e1619465c49d user: Victor Stinner date: Tue Jan 21 02:38:33 2014 +0100 files: Lib/test/test_epoll.py description: (Merge 3.3) Issue #20311: Try to fix the unit test, use time.monotonic() instead of time.perf_counter() diff -r e042ea77a152 -r 26c54e9a933b Lib/test/test_epoll.py --- a/Lib/test/test_epoll.py Tue Jan 21 01:48:28 2014 +0100 +++ b/Lib/test/test_epoll.py Tue Jan 21 02:38:33 2014 +0100 @@ -260,9 +260,9 @@ epoll = select.epoll() self.addCleanup(epoll.close) for timeout in (1e-2, 1e-3, 1e-4): - t0 = time.perf_counter() + t0 = time.monotonic() epoll.poll(timeout) - dt = time.perf_counter() - t0 + dt = time.monotonic() - t0 self.assertGreaterEqual(dt, timeout)