Skip to content

Commit 93e6283

Browse files
committed
merge _async_yield_pytest_fixture_finalizer() and tear_it_down()
1 parent e82be78 commit 93e6283

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

pytest_twisted.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,9 @@ def _async_pytest_fixture_setup(fixturedef, request, mark):
240240
coroutine = fixture_function(**kwargs)
241241

242242
finalizer = functools.partial(
243+
_run_inline_callbacks,
243244
_async_yield_pytest_fixture_finalizer,
244-
coroutine=coroutine,
245+
coroutine,
245246
)
246247
request.addfinalizer(finalizer)
247248

@@ -256,15 +257,12 @@ def _async_pytest_fixture_setup(fixturedef, request, mark):
256257
defer.returnValue(arg_value)
257258

258259

260+
@defer.inlineCallbacks
259261
def _async_yield_pytest_fixture_finalizer(coroutine):
260-
"""Teardown async yield fixture coroutine."""
261-
deferred = defer.ensureDeferred(coroutine.__anext__())
262-
_run_inline_callbacks(tear_it_down, deferred)
262+
"""Tear down a specific async yield fixture."""
263263

264+
deferred = defer.ensureDeferred(coroutine.__anext__())
264265

265-
@defer.inlineCallbacks
266-
def tear_it_down(deferred):
267-
"""Tear down a specific async yield fixture."""
268266
try:
269267
yield deferred
270268
except StopAsyncIteration:

0 commit comments

Comments
 (0)