diff --git a/setup.py b/setup.py index e65659825..4c12fbfcc 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,6 @@ def main(): "attrs>=17.4.0", "more-itertools>=4.0.0", "atomicwrites>=1.0", - "monotonic", ] # if _PYTEST_SETUP_SKIP_PLUGGY_DEP is set, skip installing pluggy; # used by tox.ini to test with pluggy master diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py index 15638e42b..1b836e546 100644 --- a/src/_pytest/pytester.py +++ b/src/_pytest/pytester.py @@ -3,7 +3,6 @@ from __future__ import absolute_import, division, print_function import codecs import gc -import monotonic import os import platform import re @@ -1074,14 +1073,14 @@ class Testdir(object): except subprocess.TimeoutExpired: raise self.TimeoutExpired() else: - end = monotonic.monotonic() + timeout + end = time.time() + timeout while True: ret = popen.poll() if ret is not None: break - remaining = end - monotonic.monotonic() + remaining = end - time.time() if remaining <= 0: raise self.TimeoutExpired()