summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRan Benita <ran@unusedvar.com>2021-01-01 22:03:52 +0200
committerRan Benita <ran@unusedvar.com>2021-01-24 14:08:39 +0200
commit0d19aff562680321a4dab33b1623edb424896d24 (patch)
tree26cde5b7c6e9b34592ac29e0b7c09b43090d1f49 /src
parent1db78bec311b9ad161dd201a1796abf82feeb8a8 (diff)
downloadpytest-0d19aff562680321a4dab33b1623edb424896d24.tar.gz
runner: schedule node.teardown() call already at setup
This is more elegant.
Diffstat (limited to 'src')
-rw-r--r--src/_pytest/runner.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/_pytest/runner.py b/src/_pytest/runner.py
index 5dbb26aef..63f9227ec 100644
--- a/src/_pytest/runner.py
+++ b/src/_pytest/runner.py
@@ -422,7 +422,7 @@ class SetupState:
needed_collectors = colitem.listchain()
for col in needed_collectors[len(self.stack) :]:
assert col not in self.stack
- self.stack[col] = []
+ self.stack[col] = [col.teardown]
try:
col.setup()
except TEST_OUTCOME as e:
@@ -443,7 +443,6 @@ class SetupState:
if list(self.stack.keys()) == needed_collectors[: len(self.stack)]:
break
colitem, finalizers = self.stack.popitem()
- finalizers.insert(0, colitem.teardown)
while finalizers:
fin = finalizers.pop()
try: