Merge pull request #4092 from altendky/4073-altendky-subprocessing_timeout-take_2

Correct timing in test_pytester.test_testdir_run_with_timeout()
This commit is contained in:
Daniel Hahler 2018-10-09 18:46:58 +02:00 committed by GitHub
commit b8958168f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -412,13 +412,15 @@ def test_testdir_run_no_timeout(testdir):
def test_testdir_run_with_timeout(testdir):
testfile = testdir.makepyfile("def test_no_timeout(): pass")
timeout = 120
start = time.time()
result = testdir.runpytest_subprocess(testfile, timeout=120)
result = testdir.runpytest_subprocess(testfile, timeout=timeout)
end = time.time()
duration = end - start
assert result.ret == EXIT_OK
assert duration < 5
assert duration < timeout
def test_testdir_run_timeout_expires(testdir):