From 432a60bd522d18a1f8c976e9a72e2dcf70f3aef0 Mon Sep 17 00:00:00 2001 From: Teejay Date: Fri, 27 Jan 2023 09:33:46 -0800 Subject: [PATCH] [7.2.x] Fix fixtures named teardown being considered by nose --- AUTHORS | 1 + changelog/10597.bugfix.rst | 1 + src/_pytest/python.py | 6 +++--- testing/test_nose.py | 21 +++++++++++++++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 changelog/10597.bugfix.rst diff --git a/AUTHORS b/AUTHORS index f048657d7..697cca65b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -344,6 +344,7 @@ Thomas Grainger Thomas Hisch Tim Hoffmann Tim Strazny +TJ Bruno Tobias Diez Tom Dalton Tom Viner diff --git a/changelog/10597.bugfix.rst b/changelog/10597.bugfix.rst new file mode 100644 index 000000000..9070e74a3 --- /dev/null +++ b/changelog/10597.bugfix.rst @@ -0,0 +1 @@ +Fix bug where a fixture method named ``teardown`` would be called as part of ``nose`` teardown stage. diff --git a/src/_pytest/python.py b/src/_pytest/python.py index 1e30d42ce..75d64fbdf 100644 --- a/src/_pytest/python.py +++ b/src/_pytest/python.py @@ -848,7 +848,7 @@ class Class(PyCollector): other fixtures (#517). """ setup_class = _get_first_non_fixture_func(self.obj, ("setup_class",)) - teardown_class = getattr(self.obj, "teardown_class", None) + teardown_class = _get_first_non_fixture_func(self.obj, ("teardown_class",)) if setup_class is None and teardown_class is None: return @@ -885,12 +885,12 @@ class Class(PyCollector): emit_nose_setup_warning = True setup_method = _get_first_non_fixture_func(self.obj, (setup_name,)) teardown_name = "teardown_method" - teardown_method = getattr(self.obj, teardown_name, None) + teardown_method = _get_first_non_fixture_func(self.obj, (teardown_name,)) emit_nose_teardown_warning = False if teardown_method is None and has_nose: teardown_name = "teardown" emit_nose_teardown_warning = True - teardown_method = getattr(self.obj, teardown_name, None) + teardown_method = _get_first_non_fixture_func(self.obj, (teardown_name,)) if setup_method is None and teardown_method is None: return diff --git a/testing/test_nose.py b/testing/test_nose.py index 92d6b95fd..e838e79dd 100644 --- a/testing/test_nose.py +++ b/testing/test_nose.py @@ -496,3 +496,24 @@ def test_nose_setup_skipped_if_non_callable(pytester: Pytester) -> None: ) result = pytester.runpytest(p, "-p", "nose") assert result.ret == 0 + + +@pytest.mark.parametrize("fixture_name", ("teardown", "teardown_class")) +def test_teardown_fixture_not_called_directly(fixture_name, pytester: Pytester) -> None: + """Regression test for #10597.""" + p = pytester.makepyfile( + f""" + import pytest + + class TestHello: + + @pytest.fixture + def {fixture_name}(self): + yield + + def test_hello(self, {fixture_name}): + assert True + """ + ) + result = pytester.runpytest(p, "-p", "nose") + assert result.ret == 0