diff options
author | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2017-02-28 14:09:39 +0100 |
---|---|---|
committer | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2017-03-28 11:45:06 +0200 |
commit | 6a02cdbb35cdd37518ff6522deb38ba8e3b97b97 (patch) | |
tree | 878d36ed952ee9d344dad6aa85e447a11fb72df5 /pytest.py | |
parent | c74103f395f5ff1d338c79fe8daa50ce472c5552 (diff) | |
download | pytest-6a02cdbb35cdd37518ff6522deb38ba8e3b97b97.tar.gz |
remove pytest_namespace from _pytest/runner.py
Diffstat (limited to 'pytest.py')
-rw-r--r-- | pytest.py | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -15,7 +15,12 @@ __all__ = [ 'warns', 'deprecated_call', 'fixture', - 'yield_fixture' + 'yield_fixture', + 'fail', + 'skip', + 'importorskip', + 'exit', + ] if __name__ == '__main__': # if run as a script or by 'python -m pytest' @@ -35,8 +40,7 @@ from _pytest.freeze_support import freeze_includes from _pytest import __version__ from _pytest.debugging import pytestPDB as __pytestPDB from _pytest.recwarn import warns, deprecated_call - - +from _pytest.runner import fail, skip, importorskip, exit set_trace = __pytestPDB.set_trace _preloadplugins() # to populate pytest.* namespace so help(pytest) works |