summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRan Benita <ran@unusedvar.com>2020-12-30 17:36:42 +0200
committerRan Benita <ran@unusedvar.com>2021-01-24 14:08:39 +0200
commitceb4d6f6d595532be599e6382b571f3b4f614df9 (patch)
treec1a740ee1bdba2d8cc297d396eb05e9672de7ecc /src
parent5f4e55fb6d01a1dd199ed0f484e460be7d0e222a (diff)
downloadpytest-ceb4d6f6d595532be599e6382b571f3b4f614df9.tar.gz
runner: inline a couple of SetupState methods
Code is clearer this way.
Diffstat (limited to 'src')
-rw-r--r--src/_pytest/runner.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/_pytest/runner.py b/src/_pytest/runner.py
index 017573cec..5d35f520a 100644
--- a/src/_pytest/runner.py
+++ b/src/_pytest/runner.py
@@ -438,9 +438,6 @@ class SetupState:
def _pop_and_teardown(self) -> None:
colitem = self.stack.pop()
- self._teardown_with_finalization(colitem)
-
- def _callfinalizers(self, colitem: Node) -> None:
finalizers = self._finalizers.pop(colitem, None)
exc = None
while finalizers:
@@ -454,9 +451,6 @@ class SetupState:
exc = e
if exc:
raise exc
-
- def _teardown_with_finalization(self, colitem: Node) -> None:
- self._callfinalizers(colitem)
colitem.teardown()
for colitem in self._finalizers:
assert colitem in self.stack