p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7030 from bluetech/increase-test_timeout-timeout 

Increase test_faulthandler.py::test_timeout sleep duration on CI
This commit is contained in:
Ran Benita 2020-04-07 00:06:16 +03:00 committed by GitHub
parent cb06bc7d6e 7da3e3aaad
commit c659a6b917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/test_faulthandler.py
View File

@ -58,7 +58,7 @@ def test_timeout(testdir, enabled):
""" """
import os, time import os, time
def test_timeout(): def test_timeout():
time.sleep(1 if "CI" in os.environ else 0.1) time.sleep(10 if "CI" in os.environ else 0.1)
""" """
) )
testdir.makeini( testdir.makeini(
@ -71,8 +71,6 @@ def test_timeout(testdir, enabled):
result = testdir.runpytest_subprocess(*args) result = testdir.runpytest_subprocess(*args)
tb_output = "most recent call first" tb_output = "most recent call first"
if sys.version_info[:2] == (3, 3):
tb_output = "Thread"
if enabled: if enabled:
result.stderr.fnmatch_lines(["*%s*" % tb_output]) result.stderr.fnmatch_lines(["*%s*" % tb_output])
else: else: