fix issue53: nose-style setup now called with the correct ordering
This commit is contained in:
parent
e91dc7c895
commit
758b5e3511
|
@ -1,6 +1,7 @@
|
||||||
Changes between 2.0.3 and 2.1.0.DEV
|
Changes between 2.0.3 and 2.1.0.DEV
|
||||||
----------------------------------------------
|
----------------------------------------------
|
||||||
|
|
||||||
|
- fix issue53 call nosestyle setup functions with correct ordering
|
||||||
- fix issue58 and issue59: new assertion code fixes
|
- fix issue58 and issue59: new assertion code fixes
|
||||||
- merge Benjamin's assertionrewrite branch: now assertions
|
- merge Benjamin's assertionrewrite branch: now assertions
|
||||||
for test modules on python 2.6 and above are done by rewriting
|
for test modules on python 2.6 and above are done by rewriting
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
#
|
#
|
||||||
__version__ = '2.1.0.dev8'
|
__version__ = '2.1.0.dev9'
|
||||||
|
|
|
@ -13,6 +13,7 @@ def pytest_runtest_makereport(__multicall__, item, call):
|
||||||
call.excinfo = call2.excinfo
|
call.excinfo = call2.excinfo
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.trylast
|
||||||
def pytest_runtest_setup(item):
|
def pytest_runtest_setup(item):
|
||||||
if isinstance(item, (pytest.Function)):
|
if isinstance(item, (pytest.Function)):
|
||||||
if isinstance(item.parent, pytest.Generator):
|
if isinstance(item.parent, pytest.Generator):
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -22,7 +22,7 @@ def main():
|
||||||
name='pytest',
|
name='pytest',
|
||||||
description='py.test: simple powerful testing with Python',
|
description='py.test: simple powerful testing with Python',
|
||||||
long_description = long_description,
|
long_description = long_description,
|
||||||
version='2.1.0.dev8',
|
version='2.1.0.dev9',
|
||||||
url='http://pytest.org',
|
url='http://pytest.org',
|
||||||
license='MIT license',
|
license='MIT license',
|
||||||
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
||||||
|
|
|
@ -255,3 +255,19 @@ def test_nose_style_setup_teardown(testdir):
|
||||||
result.stdout.fnmatch_lines([
|
result.stdout.fnmatch_lines([
|
||||||
"*2 passed*",
|
"*2 passed*",
|
||||||
])
|
])
|
||||||
|
|
||||||
|
def test_nose_setup_ordering(testdir):
|
||||||
|
testdir.makepyfile("""
|
||||||
|
def setup_module(mod):
|
||||||
|
mod.visited = True
|
||||||
|
|
||||||
|
class TestClass:
|
||||||
|
def setup(self):
|
||||||
|
assert visited
|
||||||
|
def test_first(self):
|
||||||
|
pass
|
||||||
|
""")
|
||||||
|
result = testdir.runpytest()
|
||||||
|
result.stdout.fnmatch_lines([
|
||||||
|
"*1 passed*",
|
||||||
|
])
|
||||||
|
|
Loading…
Reference in New Issue