Skip to content

Commit 0d19aff

Browse files
committed
runner: schedule node.teardown() call already at setup
This is more elegant.
1 parent 1db78be commit 0d19aff

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/_pytest/runner.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ def prepare(self, colitem: Item) -> None:
422422
needed_collectors = colitem.listchain()
423423
for col in needed_collectors[len(self.stack) :]:
424424
assert col not in self.stack
425-
self.stack[col] = []
425+
self.stack[col] = [col.teardown]
426426
try:
427427
col.setup()
428428
except TEST_OUTCOME as e:
@@ -443,7 +443,6 @@ def teardown_exact(self, nextitem: Optional[Item]) -> None:
443443
if list(self.stack.keys()) == needed_collectors[: len(self.stack)]:
444444
break
445445
colitem, finalizers = self.stack.popitem()
446-
finalizers.insert(0, colitem.teardown)
447446
while finalizers:
448447
fin = finalizers.pop()
449448
try:

0 commit comments

Comments
 (0)