diff options
| author | holger krekel <holger@merlinux.eu> | 2012-10-05 10:21:35 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2012-10-05 10:21:35 +0200 |
| commit | 8282efbb4041705a0ef169a07cd08f95c8809dc3 (patch) | |
| tree | 739718c894445722f072f9c712491c63cd9eaeea /_pytest/nose.py | |
| parent | 9251e747af4ed0df808299062a3c132a7ead0bde (diff) | |
| download | pytest-8282efbb4041705a0ef169a07cd08f95c8809dc3.tar.gz | |
internally unify setup and fixture code, making setup a shortcut to fixture(autoactive=True)
Diffstat (limited to '_pytest/nose.py')
| -rw-r--r-- | _pytest/nose.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_pytest/nose.py b/_pytest/nose.py index 215fac291..cde916400 100644 --- a/_pytest/nose.py +++ b/_pytest/nose.py @@ -41,7 +41,7 @@ def pytest_make_collect_report(collector): def call_optional(obj, name): method = getattr(obj, name, None) - if method is not None and not hasattr(method, "_pytestsetup"): + if method is not None and not hasattr(method, "_pytestfixturefunction"): # If there's any problems allow the exception to raise rather than # silently ignoring them method() |