floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into features (#5332)

Browse Source 
Merge master into features
This commit is contained in:
Bruno Oliveira
2019-05-29 20:39:27 -03:00
committed by GitHub
parent 84569ca4da af21e6b45c
commit b0f090890c
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
testing/conftest.py
View File

@@ -11,9 +11,10 @@ def pytest_collection_modifyitems(config, items):
"""
fast_items = []
slow_items = []
slowest_items = []
neutral_items = []
slow_fixturenames = ("testdir",)
spawn_names = {"spawn_pytest", "spawn"}
for item in items:
try:
@@ -23,15 +24,19 @@ def pytest_collection_modifyitems(config, items):
# (https://github.com/pytest-dev/pytest/issues/5070)
neutral_items.append(item)
else:
if any(x for x in fixtures if x in slow_fixturenames):
slow_items.append(item)
if "testdir" in fixtures:
if spawn_names.intersection(item.function.__code__.co_names):
item.add_marker(pytest.mark.uses_pexpect)
slowest_items.append(item)
else:
slow_items.append(item)
else:
marker = item.get_closest_marker("slow")
if marker:
slow_items.append(item)
slowest_items.append(item)
else:
fast_items.append(item)
items[:] = fast_items + neutral_items + slow_items
items[:] = fast_items + neutral_items + slow_items + slowest_items
yield