p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove pytest_namespace from _pytest.skipping

This commit is contained in:
Ronny Pfannschmidt 2017-02-28 17:03:23 +01:00
parent 90788defb2
commit 9b755f6ec6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/skipping.py
View File

@ -57,10 +57,6 @@ def pytest_configure(config):
) )
def pytest_namespace():
return dict(xfail=xfail)
class XFailed(pytest.fail.Exception): class XFailed(pytest.fail.Exception):
""" raised from an explicit call to pytest.xfail() """ """ raised from an explicit call to pytest.xfail() """

2
pytest.py
View File

@ -18,6 +18,7 @@ __all__ = [
'yield_fixture', 'yield_fixture',
'fail', 'fail',
'skip', 'skip',
'xfail',
'importorskip', 'importorskip',
'exit', 'exit',
'mark', 'mark',
@ -43,6 +44,7 @@ from _pytest.debugging import pytestPDB as __pytestPDB
from _pytest.recwarn import warns, deprecated_call from _pytest.recwarn import warns, deprecated_call
from _pytest.runner import fail, skip, importorskip, exit from _pytest.runner import fail, skip, importorskip, exit
from _pytest.mark import MARK_GEN as mark from _pytest.mark import MARK_GEN as mark
from _pytest.skipping import xfail
set_trace = __pytestPDB.set_trace set_trace = __pytestPDB.set_trace
_preloadplugins() # to populate pytest.* namespace so help(pytest) works _preloadplugins() # to populate pytest.* namespace so help(pytest) works