jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve --markers output

This commit is contained in:
holger krekel 2012-10-20 13:56:53 +02:00
parent 9ed127b5da
commit f41f7fda68
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -8,6 +8,9 @@ Changes between 2.3.0 and 2.3.dev
- skip pexpect using tests (test_pdb.py mostly) on freebsd* systems - skip pexpect using tests (test_pdb.py mostly) on freebsd* systems
due to pexpect not supporting it properly (hanging) due to pexpect not supporting it properly (hanging)
- link to web pages from --markers output which provides help for
pytest.mark.* usage.
Changes between 2.2.4 and 2.3.0 Changes between 2.2.4 and 2.3.0
----------------------------------- -----------------------------------

4
_pytest/python.py
View File

@ -110,10 +110,12 @@ def pytest_configure(config):
"times passing in multiple different argument value sets. Example: " "times passing in multiple different argument value sets. Example: "
"@parametrize('arg1', [1,2]) would lead to two calls of the decorated " "@parametrize('arg1', [1,2]) would lead to two calls of the decorated "
"test function, one with arg1=1 and another with arg1=2." "test function, one with arg1=1 and another with arg1=2."
" see http://pytest.org/latest/parametrize.html for more info and "
"examples."
) )
config.addinivalue_line("markers", config.addinivalue_line("markers",
"usefixtures(fixturename1, fixturename2, ...): mark tests as needing " "usefixtures(fixturename1, fixturename2, ...): mark tests as needing "
"all of the specified fixtures." "all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures "
) )
def pytest_sessionstart(session): def pytest_sessionstart(session):

4
_pytest/skipping.py
View File

@ -14,7 +14,8 @@ def pytest_configure(config):
"skipif(*conditions): skip the given test function if evaluation " "skipif(*conditions): skip the given test function if evaluation "
"of all conditions has a True value. Evaluation happens within the " "of all conditions has a True value. Evaluation happens within the "
"module global context. Example: skipif('sys.platform == \"win32\"') " "module global context. Example: skipif('sys.platform == \"win32\"') "
"skips the test if we are on the win32 platform. " "skips the test if we are on the win32 platform. see "
"http://pytest.org/latest/skipping.html"
) )
config.addinivalue_line("markers", config.addinivalue_line("markers",
"xfail(*conditions, reason=None, run=True): mark the the test function " "xfail(*conditions, reason=None, run=True): mark the the test function "
@ -22,6 +23,7 @@ def pytest_configure(config):
"if you don't even want to execute the test function. Any positional " "if you don't even want to execute the test function. Any positional "
"condition strings will be evaluated (like with skipif) and if one is " "condition strings will be evaluated (like with skipif) and if one is "
"False the marker will not be applied." "False the marker will not be applied."
"see http://pytest.org/latest/skipping.html"
) )
def pytest_namespace(): def pytest_namespace():