[svn r63600] merge remaining content of event.py into runner.py.

--HG-- branch : trunk
2009-04-04 02:34:20 +02:00
parent 7b47da2203
commit 4aeb929b3c
10 changed files with 104 additions and 122 deletions
--- a/py/test/plugin/pytest_default.py
+++ b/py/test/plugin/pytest_default.py
@@ -14,8 +14,8 @@ class DefaultPlugin:
        return True

    def pytest_item_makereport(self, item, excinfo, when, outerr):
-        from py.__.test import event
-        return event.ItemTestReport(item, excinfo, when, outerr)
+        from py.__.test import runner
+        return runner.ItemTestReport(item, excinfo, when, outerr)

    def pytest_pyfunc_call(self, pyfuncitem, args, kwargs):
        pyfuncitem.obj(*args, **kwargs)