summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorRonny Pfannschmidt <opensource@ronnypfannschmidt.de>2018-03-19 18:39:56 +0100
committerRonny Pfannschmidt <opensource@ronnypfannschmidt.de>2018-03-29 17:52:01 +0200
commit159ea9b7c0654f7e300ec2a91d7502ce1ae45571 (patch)
treef859eb2f2d731c8145146370d1633754254b9745 /testing
parent775fb96ac3f86de3e53120769fd0eb72c1d9dce0 (diff)
downloadpytest-159ea9b7c0654f7e300ec2a91d7502ce1ae45571.tar.gz
turn Markinfo into atts clsas, and return correct instances of it from node.get_marker
Diffstat (limited to 'testing')
-rw-r--r--testing/test_mark.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/testing/test_mark.py b/testing/test_mark.py
index 42c5d8bc5..64b201577 100644
--- a/testing/test_mark.py
+++ b/testing/test_mark.py
@@ -14,7 +14,7 @@ ignore_markinfo = pytest.mark.filterwarnings('ignore:MarkInfo objects:_pytest.de
class TestMark(object):
def test_markinfo_repr(self):
from _pytest.mark import MarkInfo, Mark
- m = MarkInfo(Mark("hello", (1, 2), {}))
+ m = MarkInfo.for_mark(Mark("hello", (1, 2), {}))
repr(m)
@pytest.mark.parametrize('attr', ['mark', 'param'])
@@ -684,6 +684,7 @@ class TestFunctional(object):
reprec = testdir.inline_run()
reprec.assertoutcome(passed=1)
+ @ignore_markinfo
def test_keyword_added_for_session(self, testdir):
testdir.makeconftest("""
import pytest