make Test Outcomes inherit from BaseException instead of exception

fixes #580

1 files changed, 1 insertions, 2 deletions

diff --git a/pytest.py b/pytest.py
index da6b64910..1c914a6ed 100644
--- a/pytest.py
+++ b/pytest.py
@@ -16,9 +16,8 @@ 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
+from _pytest.outcomes import fail, skip, importorskip, exit, xfail
 from _pytest.mark import MARK_GEN as mark, param
-from _pytest.skipping import xfail
 from _pytest.main import Item, Collector, File, Session
 from _pytest.fixtures import fillfixtures as _fillfuncargs
 from _pytest.python import (