jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4144 from nicoddemus/fix-flaky-durations-test 

Fix flaky durations test
This commit is contained in:
Bruno Oliveira 2018-10-14 18:40:14 -03:00 committed by GitHub
parent fe2dae4885 4808145846
commit 49defa2890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/acceptance_test.py
View File

@ -808,7 +808,6 @@ class TestDurations(object):
result.stdout.fnmatch_lines_random( result.stdout.fnmatch_lines_random(
["*durations*", "*call*test_3*", "*call*test_2*"] ["*durations*", "*call*test_3*", "*call*test_2*"]
) )
assert "test_something" not in result.stdout.str()
result.stdout.fnmatch_lines( result.stdout.fnmatch_lines(
["(0.00 durations hidden. Use -vv to show these durations.)"] ["(0.00 durations hidden. Use -vv to show these durations.)"]
) )

6
testing/python/fixture.py
View File

@ -494,6 +494,12 @@ class TestRequestBasic(object):
reason="this method of test doesn't work on pypy", reason="this method of test doesn't work on pypy",
) )
def test_request_garbage(self, testdir): def test_request_garbage(self, testdir):
try:
import xdist # noqa
except ImportError:
pass
else:
pytest.xfail("this test is flaky when executed with xdist")
testdir.makepyfile( testdir.makepyfile(
""" """
import sys import sys