Skip to content

Commit 67b446e

Browse files
committed
Remove testing no-op
1 parent e573578 commit 67b446e

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

tests/conftest.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616

1717
import pytest
1818

19-
try:
20-
from _pytest.python import transfer_markers
21-
except ImportError: # Pytest 4.1.0 removes the transfer_marker api (#104)
22-
23-
def transfer_markers(*args, **kwargs): # noqa
24-
"""Noop when over pytest 4.1.0"""
25-
pass
26-
2719

2820
def _is_coroutine(obj):
2921
"""Check to see if an object is really an asyncio coroutine."""
@@ -35,12 +27,5 @@ def pytest_pycollect_makeitem(collector, name, obj):
3527
"""A pytest hook to collect asyncio coroutines."""
3628
if collector.funcnamefilter(name) and _is_coroutine(obj):
3729
item = pytest.Function.from_parent(collector, name=name)
38-
39-
# Due to how pytest test collection works, module-level pytestmarks
40-
# are applied after the collection step. Since this is the collection
41-
# step, we look ourselves.
42-
transfer_markers(obj, item.cls, item.module)
43-
item = pytest.Function.from_parent(collector, name=name) # To reload keywords.
44-
4530
if "asyncio" in item.keywords:
4631
return list(collector._genfunctions(name, obj))

0 commit comments

Comments
 (0)