python: skip nose setup/teardown fixtures if non-callable
Since commit 89f0b5b5a2
cases as in the
added test started to fail, like they do for the standard pytest names
(`setup_module` etc). But the name `setup` in particular is way too
common for us to start taking it over more aggressively, so restore the
previous behavior which required the object to be callable.
Fix #9391.
This commit is contained in:
parent
443aa0219c
commit
10e21dadee
|
@ -522,12 +522,18 @@ class Module(nodes.File, PyCollector):
|
|||
self.obj, ("setUpModule", "setup_module")
|
||||
)
|
||||
if setup_module is None and has_nose:
|
||||
# The name "setup" is too common - only treat as fixture if callable.
|
||||
setup_module = _get_first_non_fixture_func(self.obj, ("setup",))
|
||||
if not callable(setup_module):
|
||||
setup_module = None
|
||||
teardown_module = _get_first_non_fixture_func(
|
||||
self.obj, ("tearDownModule", "teardown_module")
|
||||
)
|
||||
if teardown_module is None and has_nose:
|
||||
teardown_module = _get_first_non_fixture_func(self.obj, ("teardown",))
|
||||
# Same as "setup" above - only treat as fixture if callable.
|
||||
if not callable(teardown_module):
|
||||
teardown_module = None
|
||||
|
||||
if setup_module is None and teardown_module is None:
|
||||
return
|
||||
|
|
|
@ -477,3 +477,22 @@ def test_raises(pytester: Pytester) -> None:
|
|||
"* 1 failed, 2 passed *",
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
def test_nose_setup_skipped_if_non_callable(pytester: Pytester) -> None:
|
||||
"""Regression test for #9391."""
|
||||
p = pytester.makepyfile(
|
||||
__init__="",
|
||||
setup="""
|
||||
""",
|
||||
teardown="""
|
||||
""",
|
||||
test_it="""
|
||||
from . import setup, teardown
|
||||
|
||||
def test_it():
|
||||
pass
|
||||
""",
|
||||
)
|
||||
result = pytester.runpytest(p, "-p", "nose")
|
||||
assert result.ret == 0
|
||||
|
|
Loading…
Reference in New Issue