Skip to content

Commit af6a3ea

Browse files
Marked value: expose as pytest.marked for future enhancements in construction
1 parent 25ea19e commit af6a3ea

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

_pytest/mark.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class MarkerError(Exception):
1818
def pytest_namespace():
1919
return {
2020
'mark': MarkGenerator(),
21-
'Marked': Marked,
21+
'marked': Marked,
2222
}
2323

2424

testing/python/metafunc.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1377,11 +1377,11 @@ def test_parametrize_marked_value(self, testdir, strict):
13771377
import pytest
13781378
13791379
@pytest.mark.parametrize(("n", "expected"), [
1380-
pytest.Marked(
1380+
pytest.marked(
13811381
value=(2,3),
13821382
marks=pytest.mark.xfail("sys.version_info > (0, 0, 0)", reason="some bug", strict={strict}),
13831383
),
1384-
pytest.Marked(
1384+
pytest.marked(
13851385
value=(2,3),
13861386
marks=[pytest.mark.xfail("sys.version_info > (0, 0, 0)", reason="some bug", strict={strict})],
13871387
),

testing/test_mark.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_markinfo_repr(self):
1212
m = MarkInfo("hello", (1,2), {})
1313
repr(m)
1414

15-
@pytest.mark.parametrize('attr', ['mark', 'Marked'])
15+
@pytest.mark.parametrize('attr', ['mark', 'marked'])
1616
@pytest.mark.parametrize('modulename', ['py.test', 'pytest'])
1717
def test_pytest_exists_in_namespace_all(self, attr, modulename):
1818
module = sys.modules[modulename]

0 commit comments

Comments
 (0)