jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

runner: make sure SetupState._finalizers is always set for a node in the stack 

This makes the stack <-> _finalizers correspondence clearer.
This commit is contained in:
Ran Benita 2021-01-01 13:55:49 +02:00
parent d1fcd425a3
commit 14d71b2c22
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/_pytest/runner.py
View File

@ -423,6 +423,7 @@ class SetupState:
needed_collectors = colitem.listchain() needed_collectors = colitem.listchain()
for col in needed_collectors[len(self.stack) :]: for col in needed_collectors[len(self.stack) :]:
self.stack.append(col) self.stack.append(col)
self._finalizers.setdefault(col, [])
try: try:
col.setup() col.setup()
except TEST_OUTCOME as e: except TEST_OUTCOME as e:
@ -444,7 +445,7 @@ class SetupState:
break break
try: try:
colitem = self.stack.pop() colitem = self.stack.pop()
finalizers = self._finalizers.pop(colitem, None) finalizers = self._finalizers.pop(colitem)
inner_exc = None inner_exc = None
while finalizers: while finalizers:
fin = finalizers.pop() fin = finalizers.pop()