floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nose.py: don't try to call setup if it's not callable

This commit is contained in:
ataumoefolau 2012-10-12 14:39:17 +10:00
parent 6eec2f5893
commit 40a55a640c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/nose.py
View File

@ -41,7 +41,7 @@ def pytest_make_collect_report(collector):
def call_optional(obj, name): def call_optional(obj, name):
method = getattr(obj, name, None) method = getattr(obj, name, None)
if method is not None and not hasattr(method, "_pytestfixturefunction"): if method is not None and not hasattr(method, "_pytestfixturefunction") and callable(method):
# If there's any problems allow the exception to raise rather than # If there's any problems allow the exception to raise rather than
# silently ignoring them # silently ignoring them
method() method()