From ceb4d6f6d595532be599e6382b571f3b4f614df9 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Wed, 30 Dec 2020 17:36:42 +0200
Subject: runner: inline a couple of SetupState methods

Code is clearer this way.
---
 src/_pytest/runner.py | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/_pytest/runner.py')

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
-- 
cgit v1.2.3