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

remove .markers attribute which was added in development and after 2.2.4

Browse Source 
so never released.  Rather extend keywords to also exist on nodes. Assigning
to node.keywords will make the value appear on all subchildren's
keywords.
This commit is contained in:
holger krekel
2012-10-18 13:52:32 +02:00
parent dbaedbacde
commit 7d747a1cde
9 changed files with 99 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
testing/test_python.py
View File

@@ -731,16 +731,16 @@ class TestMarking:
assert 'skipif' in item1.keywords
pytest.raises(ValueError, "req1.applymarker(42)")
def test_accessmarker_function(self, testdir):
def test_accesskeywords(self, testdir):
testdir.makepyfile("""
import pytest
@pytest.fixture()
def markers(request):
return request.node.markers
def keywords(request):
return request.keywords
@pytest.mark.XYZ
def test_function(markers):
assert markers.XYZ is not None
assert not hasattr(markers, "abc")
def test_function(keywords):
assert keywords["XYZ"]
assert "abc" not in keywords
""")
reprec = testdir.inline_run()
reprec.assertoutcome(passed=1)
@@ -749,8 +749,8 @@ class TestMarking:
testdir.makeconftest("""
import pytest
@pytest.fixture()
def markers(request):
return request.node.markers
def keywords(request):
return request.keywords
@pytest.fixture(scope="class", autouse=True)
def marking(request):
@@ -758,12 +758,12 @@ class TestMarking:
""")
testdir.makepyfile("""
import pytest
def test_fun1(markers):
assert markers.XYZ is not None
assert not hasattr(markers, "abc")
def test_fun2(markers):
assert markers.XYZ is not None
assert not hasattr(markers, "abc")
def test_fun1(keywords):
assert keywords["XYZ"] is not None
assert "abc" not in keywords
def test_fun2(keywords):
assert keywords["XYZ"] is not None
assert "abc" not in keywords
""")
reprec = testdir.inline_run()
reprec.assertoutcome(passed=2)