IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix flakes

Browse Source
This commit is contained in:
Bruno Oliveira
2017-08-02 21:33:58 -03:00
parent a7f8c22ae5
commit 6e99c0d4c5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
testing/acceptance_test.py
View File

@@ -728,8 +728,10 @@ class TestLoadScope:
test_b=test_file, test_b=test_file,
) )
result = testdir.runpytest('-n2', '--dist=loadscope', '-v') result = testdir.runpytest('-n2', '--dist=loadscope', '-v')
assert get_workers_and_test_count_by_prefix('test_a.py::test', result.outlines) == {'gw0': 10} assert get_workers_and_test_count_by_prefix(
assert get_workers_and_test_count_by_prefix('test_b.py::test', result.outlines) == {'gw1': 10} 'test_a.py::test', result.outlines) == {'gw0': 10}
assert get_workers_and_test_count_by_prefix(
'test_b.py::test', result.outlines) == {'gw1': 10}
def test_by_class(self, testdir): def test_by_class(self, testdir):
testdir.makepyfile(test_a=""" testdir.makepyfile(test_a="""
@@ -745,8 +747,10 @@ class TestLoadScope:
pass pass
""") """)
result = testdir.runpytest('-n2', '--dist=loadscope', '-v') result = testdir.runpytest('-n2', '--dist=loadscope', '-v')
assert get_workers_and_test_count_by_prefix('test_a.py::TestA', result.outlines) == {'gw0': 10} assert get_workers_and_test_count_by_prefix(
assert get_workers_and_test_count_by_prefix('test_a.py::TestB', result.outlines) == {'gw1': 10} 'test_a.py::TestA', result.outlines) == {'gw0': 10}
assert get_workers_and_test_count_by_prefix(
'test_a.py::TestB', result.outlines) == {'gw1': 10}
def parse_tests_and_workers_from_output(lines): def parse_tests_and_workers_from_output(lines):
@@ -760,7 +764,8 @@ def parse_tests_and_workers_from_output(lines):
return result return result
def get_workers_and_test_count_by_prefix(prefix, lines, expected_status='PASSED'): def get_workers_and_test_count_by_prefix(prefix, lines,
expected_status='PASSED'):
result = {} result = {}
for worker, status, nodeid in parse_tests_and_workers_from_output(lines): for worker, status, nodeid in parse_tests_and_workers_from_output(lines):
if expected_status == status and nodeid.startswith(prefix): if expected_status == status and nodeid.startswith(prefix):