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

Add strict parameter to xfail marker doc

This commit is contained in:
Quentin Pradet 2016-03-22 15:26:56 +04:00
parent 1fbd19b8cb
commit 653a53226a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_pytest/skipping.py
View File

@ -43,13 +43,13 @@ def pytest_configure(config):
"http://pytest.org/latest/skipping.html" "http://pytest.org/latest/skipping.html"
) )
config.addinivalue_line("markers", config.addinivalue_line("markers",
"xfail(condition, reason=None, run=True, raises=None): mark the the test function " "xfail(condition, reason=None, run=True, raises=None, strict=False): "
"as an expected failure if eval(condition) has a True value. " "mark the the test function as an expected failure if eval(condition) "
"Optionally specify a reason for better reporting and run=False if " "has a True value. Optionally specify a reason for better reporting "
"you don't even want to execute the test function. If only specific " "and run=False if you don't even want to execute the test function. "
"exception(s) are expected, you can list them in raises, and if the test fails " "If only specific exception(s) are expected, you can list them in "
"in other ways, it will be reported as a true failure. " "raises, and if the test fails in other ways, it will be reported as "
"See http://pytest.org/latest/skipping.html" "a true failure. See http://pytest.org/latest/skipping.html"
) )

2
testing/test_skipping.py
View File

@ -825,7 +825,7 @@ def test_default_markers(testdir):
result = testdir.runpytest("--markers") result = testdir.runpytest("--markers")
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
"*skipif(*condition)*skip*", "*skipif(*condition)*skip*",
"*xfail(*condition, reason=None, run=True, raises=None)*expected failure*", "*xfail(*condition, reason=None, run=True, raises=None, strict=False)*expected failure*",
]) ])
def test_xfail_test_setup_exception(testdir): def test_xfail_test_setup_exception(testdir):