fix Issue 265 - integrate nose setup/teardown with setupstate

as sideeffect teardown is only called if setup doesnt fail
This commit is contained in:
Ronny Pfannschmidt 2013-03-25 10:52:02 +01:00
parent ba79c1926c
commit 9c9679945e
3 changed files with 29 additions and 1 deletions

View File

@ -1,6 +1,9 @@
Changes between 2.3.4 and 2.3.5dev
-----------------------------------
- Issue 265 - integrate nose setup/teardown with setupstate
so it doesnt try to teardown if it did not setup
- issue 271 - dont write junitxml on slave nodes
- Issue 274 - dont try to show full doctest example

View File

@ -28,8 +28,10 @@ def pytest_runtest_setup(item):
if not call_optional(item.obj, 'setup'):
# call module level setup if there is no object level one
call_optional(item.parent.obj, 'setup')
#XXX this implies we only call teardown when setup worked
item.session._setupstate.addfinalizer((lambda: teardown_nose(item)), item)
def pytest_runtest_teardown(item):
def teardown_nose(item):
if is_potential_nosetest(item):
if not call_optional(item.obj, 'teardown'):
call_optional(item.parent.obj, 'teardown')

View File

@ -304,4 +304,27 @@ def test_apiwrapper_problem_issue260(testdir):
result = testdir.runpytest()
result.stdout.fnmatch_lines("*1 passed*")
def test_setup_teardown_linking_issue265(testdir):
# we accidnetially didnt integrate nose setupstate with normal setupstate
# this test ensures that won't happen again
testdir.makepyfile('''
import pytest
class TestGeneric(object):
def test_nothing(self):
"""Tests the API of the implementation (for generic and specialized)."""
@pytest.mark.skipif("True", reason="Skip tests to check if teardown is skipped as well.")
class TestSkipTeardown(TestGeneric):
def setup(self):
"""Sets up my specialized implementation for $COOL_PLATFORM."""
raise Exception("should not call setup for skipped tests")
def teardown(self):
"""Undoes the setup."""
raise Exception("should not call teardown for skipped tests")
''')
result = testdir.runpytest()
result.stdout.fnmatch_lines("*1 skipped*")