diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2018-03-16 11:31:33 +0100 |
|---|---|---|
| committer | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2018-03-29 17:52:01 +0200 |
| commit | f1a1695aaabf554fea21382b7edc0ee79e59b3d5 (patch) | |
| tree | b58893517b54935cfea0fb12fa19095cff5dd7e9 /testing | |
| parent | 27072215593b2808bbae2fb633caf556cc5852e3 (diff) | |
| download | pytest-f1a1695aaabf554fea21382b7edc0ee79e59b3d5.tar.gz | |
enable deep merging test - new structure fixed it
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/test_mark.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/test_mark.py b/testing/test_mark.py index 95e391a0c..9f4a7fc88 100644 --- a/testing/test_mark.py +++ b/testing/test_mark.py @@ -509,7 +509,6 @@ class TestFunctional(object): assert values[1].args == () assert values[2].args == ("pos1", ) - @pytest.mark.xfail(reason='unfixed') def test_merging_markers_deep(self, testdir): # issue 199 - propagate markers into nested classes p = testdir.makepyfile(""" @@ -526,7 +525,7 @@ class TestFunctional(object): items, rec = testdir.inline_genitems(p) for item in items: 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): p = testdir.makepyfile(""" @@ -716,6 +715,7 @@ class TestFunctional(object): assert marker_names == set(expected_markers) @pytest.mark.issue1540 + @pytest.mark.filterwarnings("ignore") def test_mark_from_parameters(self, testdir): testdir.makepyfile(""" import pytest |