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

introduce a SetupCall, holding meta information and setup calling state

Browse Source
This commit is contained in:
holger krekel
2012-07-30 11:51:50 +02:00
parent d68c65b493
commit b57fb9fd47
3 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
testing/test_python.py
View File

@@ -1752,10 +1752,14 @@ class TestSetupDiscovery:
testdir.makeconftest("""
import pytest
@pytest.mark.setup
def perfunction(request):
def perfunction(request, tmpdir):
pass
@pytest.mark.funcarg
def arg1(request, tmpdir):
pass
@pytest.mark.setup
def perfunction2(request):
def perfunction2(request, arg1):
pass
def pytest_funcarg__fm(request):
@@ -1769,12 +1773,16 @@ class TestSetupDiscovery:
def test_parsefactories_conftest(self, testdir):
testdir.makepyfile("""
def test_check_setup(item, fm):
setuplist, allnames = fm.getsetuplist(item.nodeid)
assert len(setuplist) == 2
assert setuplist[0][0].__name__ == "perfunction"
assert "request" in setuplist[0][1]
assert setuplist[1][0].__name__ == "perfunction2"
assert "request" in setuplist[1][1]
setupcalls, allnames = fm.getsetuplist(item.nodeid)
assert len(setupcalls) == 2
assert setupcalls[0].func.__name__ == "perfunction"
assert "request" in setupcalls[0].funcargnames
assert "tmpdir" in setupcalls[0].funcargnames
assert setupcalls[1].func.__name__ == "perfunction2"
assert "request" in setupcalls[1].funcargnames
assert "arg1" in setupcalls[1].funcargnames
assert "tmpdir" not in setupcalls[1].funcargnames
#assert "tmpdir" in setupcalls[1].depfuncargs
""")
reprec = testdir.inline_run("-s")
reprec.assertoutcome(passed=1)