diff --git a/py/test/dist/dsession.py b/py/test/dist/dsession.py index 4775fbf14..7e8ffa301 100644 --- a/py/test/dist/dsession.py +++ b/py/test/dist/dsession.py @@ -5,7 +5,6 @@ """ import py -from py.__.test import event from py.__.test.runner import basic_run_report, basic_collect_report from py.__.test.session import Session from py.__.test import outcome @@ -237,6 +236,7 @@ class DSession(Session): self.node2pending[node].remove(item) def handle_crashitem(self, item, node): + from py.__.test import event longrepr = "!!! Node %r crashed during running of test %r" %(node, item) rep = event.ItemTestReport(item, when="???", excinfo=longrepr) rep.node = node diff --git a/py/test/dist/txnode.py b/py/test/dist/txnode.py index 4a712dca8..333ef320c 100644 --- a/py/test/dist/txnode.py +++ b/py/test/dist/txnode.py @@ -2,10 +2,8 @@ Manage setup, running and local representation of remote nodes/processes. """ import py -from py.__.test import event from py.__.test.dist.mypickle import PickleChannel - class TXNode(object): """ Represents a Test Execution environment in the controlling process. - sets up a slave node through an execnet gateway diff --git a/py/test/looponfail/remote.py b/py/test/looponfail/remote.py index 71faeb53b..e26d032e2 100644 --- a/py/test/looponfail/remote.py +++ b/py/test/looponfail/remote.py @@ -12,7 +12,6 @@ from __future__ import generators import py from py.__.test.session import Session from py.__.test.dist.mypickle import PickleChannel -from py.__.test import event from py.__.test.looponfail import util class LooponfailingSession(Session): diff --git a/py/test/looponfail/util.py b/py/test/looponfail/util.py index 04599389c..0bd983d93 100644 --- a/py/test/looponfail/util.py +++ b/py/test/looponfail/util.py @@ -1,5 +1,4 @@ import py -from py.__.test import event class StatRecorder: def __init__(self, rootdirlist): diff --git a/py/test/plugin/pytest_default.py b/py/test/plugin/pytest_default.py index 7c9c7c70e..d6a07552c 100644 --- a/py/test/plugin/pytest_default.py +++ b/py/test/plugin/pytest_default.py @@ -13,6 +13,10 @@ class DefaultPlugin: item.config.pytestplugins.notify("itemtestreport", report) return True + def pytest_item_makereport(self, item, excinfo, when, outerr): + from py.__.test import event + return event.ItemTestReport(item, excinfo, when, outerr) + def pytest_pyfunc_call(self, pyfuncitem, args, kwargs): pyfuncitem.obj(*args, **kwargs) @@ -163,10 +167,6 @@ class DefaultPlugin: from py.__.test.dist.dsession import DSession config.setsessionclass(DSession) - def pytest_item_makereport(self, item, excinfo, when, outerr): - from py.__.test import event - return event.ItemTestReport(item, excinfo, when, outerr) - def test_implied_different_sessions(tmpdir): def x(*args): config = py.test.config._reparse([tmpdir] + list(args)) diff --git a/py/test/session.py b/py/test/session.py index bbf65c4f0..c66a4b166 100644 --- a/py/test/session.py +++ b/py/test/session.py @@ -6,7 +6,7 @@ """ import py -from py.__.test import event, outcome +from py.__.test import outcome # imports used for genitems() Item = py.test.collect.Item