Skip to content

Commit 04a11d7

Browse files
committed
fix double definition of pytest_configure
1 parent 54bb3b1 commit 04a11d7

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

pytest_twisted.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ class _instances:
2222
reactor = None
2323

2424

25-
def pytest_configure():
26-
pytest.inlineCallbacks = inlineCallbacks
27-
pytest.blockon = blockon
28-
29-
3025
def blockon(d):
3126
if _config.external_reactor:
3227
return block_from_thread(d)
@@ -185,4 +180,6 @@ def pytest_addoption(parser):
185180

186181

187182
def pytest_configure(config):
183+
pytest.inlineCallbacks = inlineCallbacks
184+
pytest.blockon = blockon
188185
reactor_installers[config.getoption("reactor")]()

0 commit comments

Comments
 (0)