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

enable deep merging test - new structure fixed it

This commit is contained in:
Ronny Pfannschmidt 2018-03-16 11:31:33 +01:00
parent 2707221559
commit f1a1695aaa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/test_mark.py
View File

@ -509,7 +509,6 @@ class TestFunctional(object):
assert values[1].args == () assert values[1].args == ()
assert values[2].args == ("pos1", ) assert values[2].args == ("pos1", )
@pytest.mark.xfail(reason='unfixed')
def test_merging_markers_deep(self, testdir): def test_merging_markers_deep(self, testdir):
# issue 199 - propagate markers into nested classes # issue 199 - propagate markers into nested classes
p = testdir.makepyfile(""" p = testdir.makepyfile("""
@ -526,7 +525,7 @@ class TestFunctional(object):
items, rec = testdir.inline_genitems(p) items, rec = testdir.inline_genitems(p)
for item in items: for item in items:
print(item, item.keywords) print(item, item.keywords)
assert 'a' in item.keywords assert list(item.find_markers('a'))
def test_mark_decorator_subclass_does_not_propagate_to_base(self, testdir): def test_mark_decorator_subclass_does_not_propagate_to_base(self, testdir):
p = testdir.makepyfile(""" p = testdir.makepyfile("""
@ -716,6 +715,7 @@ class TestFunctional(object):
assert marker_names == set(expected_markers) assert marker_names == set(expected_markers)
@pytest.mark.issue1540 @pytest.mark.issue1540
@pytest.mark.filterwarnings("ignore")
def test_mark_from_parameters(self, testdir): def test_mark_from_parameters(self, testdir):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest