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

Merge pull request #5331 from blueyed/conftest 

tests: conftest: fix collection of slow/slowest items
This commit is contained in:
Daniel Hahler 2019-05-29 22:13:52 +02:00 committed by GitHub
parent c35544a0f7 61b76c7f5f
commit 5c5966f62d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/conftest.py
View File

@ -27,9 +27,9 @@ def pytest_collection_modifyitems(config, items):
if "testdir" in fixtures: if "testdir" in fixtures:
if spawn_names.intersection(item.function.__code__.co_names): if spawn_names.intersection(item.function.__code__.co_names):
item.add_marker(pytest.mark.uses_pexpect) item.add_marker(pytest.mark.uses_pexpect)
slow_items.append(item) slowest_items.append(item)
else: else:
slowest_items.append(0) slow_items.append(item)
else: else:
marker = item.get_closest_marker("slow") marker = item.get_closest_marker("slow")
if marker: if marker:
@ -37,6 +37,6 @@ def pytest_collection_modifyitems(config, items):
else: else:
fast_items.append(item) fast_items.append(item)
items[:] = fast_items + neutral_items + slow_items items[:] = fast_items + neutral_items + slow_items + slowest_items
yield yield