diff options
| author | Ran Benita <ran@unusedvar.com> | 2020-12-30 17:36:42 +0200 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2021-01-24 14:08:39 +0200 |
| commit | ceb4d6f6d595532be599e6382b571f3b4f614df9 (patch) | |
| tree | c1a740ee1bdba2d8cc297d396eb05e9672de7ecc | |
| parent | 5f4e55fb6d01a1dd199ed0f484e460be7d0e222a (diff) | |
| download | pytest-ceb4d6f6d595532be599e6382b571f3b4f614df9.tar.gz | |
runner: inline a couple of SetupState methods
Code is clearer this way.
| -rw-r--r-- | src/_pytest/runner.py | 6 | ||||
| -rw-r--r-- | testing/test_runner.py | 6 |
2 files changed, 4 insertions, 8 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 diff --git a/testing/test_runner.py b/testing/test_runner.py index 8ce0f6735..20c81a62f 100644 --- a/testing/test_runner.py +++ b/testing/test_runner.py @@ -64,11 +64,12 @@ class TestSetupState: item = pytester.getitem("def test_func(): pass") ss = runner.SetupState() + ss.prepare(item) ss.addfinalizer(fin1, item) ss.addfinalizer(fin2, item) ss.addfinalizer(fin3, item) with pytest.raises(Exception) as err: - ss._callfinalizers(item) + ss.teardown_exact(item, None) assert err.value.args == ("oops",) assert r == ["fin3", "fin1"] @@ -83,10 +84,11 @@ class TestSetupState: item = pytester.getitem("def test_func(): pass") ss = runner.SetupState() + ss.prepare(item) ss.addfinalizer(fin1, item) ss.addfinalizer(fin2, item) with pytest.raises(Exception) as err: - ss._callfinalizers(item) + ss.teardown_exact(item, None) assert err.value.args == ("oops2",) def test_teardown_multiple_scopes_one_fails(self, pytester: Pytester) -> None: |