From d1946ae978ca5479ec722dc5b9239bfa7c193dbd Mon Sep 17 00:00:00 2001 From: hpk Date: Fri, 3 Apr 2009 14:18:25 +0200 Subject: [PATCH] [svn r63563] the TestrunFinish event class bites the dust. --HG-- branch : trunk --- py/test/event.py | 9 --------- py/test/plugin/api.py | 2 +- py/test/plugin/pytest_eventlog.py | 2 +- py/test/plugin/pytest_execnetcleanup.py | 4 ++-- py/test/plugin/pytest_terminal.py | 24 ++++++++++++------------ py/test/session.py | 3 ++- 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/py/test/event.py b/py/test/event.py index c8d09d0b2..b62f53bca 100644 --- a/py/test/event.py +++ b/py/test/event.py @@ -22,15 +22,6 @@ class NOP(BaseEvent): # Basic Live Reporting Events # ---------------------------------------------------------------------- -class TestrunFinish(BaseEvent): - def __init__(self, exitstatus=0, excinfo=None): - self.exitstatus = exitstatus - if excinfo is None: - self.excrepr = None - else: - self.excrepr = excinfo.getrepr() - self.timeend = time.time() - class InternalException(BaseEvent): def __init__(self, excinfo=None): if excinfo is None: diff --git a/py/test/plugin/api.py b/py/test/plugin/api.py index 965ffb10b..0c0a2a0d9 100644 --- a/py/test/plugin/api.py +++ b/py/test/plugin/api.py @@ -94,7 +94,7 @@ class Events: def pyevent__testrunstart(self): """ whole test run starts. """ - def pyevent__testrunfinish(self, event): + def pyevent__testrunfinish(self, exitstatus, excrepr=None): """ whole test run finishes. """ def pyevent__gwmanage_newgateway(self, gateway): diff --git a/py/test/plugin/pytest_eventlog.py b/py/test/plugin/pytest_eventlog.py index 2da245afb..a79867e4c 100644 --- a/py/test/plugin/pytest_eventlog.py +++ b/py/test/plugin/pytest_eventlog.py @@ -38,4 +38,4 @@ def test_generic(plugintester): s = testdir.tmpdir.join("event.log").read() assert s.find("testrunstart") != -1 assert s.find("ItemTestReport") != -1 - assert s.find("TestrunFinish") != -1 + assert s.find("testrunfinish") != -1 diff --git a/py/test/plugin/pytest_execnetcleanup.py b/py/test/plugin/pytest_execnetcleanup.py index bac660606..147ff3efa 100644 --- a/py/test/plugin/pytest_execnetcleanup.py +++ b/py/test/plugin/pytest_execnetcleanup.py @@ -25,8 +25,8 @@ class ExecnetcleanupPlugin: self.trace("testrunstart") self._gateways = [] - def pyevent__testrunfinish(self, event): - self.trace("testrunfinish", event) + def pyevent__testrunfinish(self, exitstatus, excrepr=None): + self.trace("testrunfinish", exitstatus) l = [] for gw in self._gateways: gw.exit() diff --git a/py/test/plugin/pytest_terminal.py b/py/test/plugin/pytest_terminal.py index 1163036b9..7ef8b2e9b 100644 --- a/py/test/plugin/pytest_terminal.py +++ b/py/test/plugin/pytest_terminal.py @@ -219,15 +219,15 @@ class TerminalReporter: for i, testarg in py.builtin.enumerate(self.config.args): self.write_line("test object %d: %s" %(i+1, testarg)) - def pyevent__testrunfinish(self, event): + def pyevent__testrunfinish(self, exitstatus, excrepr=None): self._tw.line("") - if event.exitstatus in (0, 1, 2): + if exitstatus in (0, 1, 2): self.summary_failures() self.summary_skips() self.config.pytestplugins.call_each("pytest_terminal_summary", terminalreporter=self) - if event.excrepr is not None: - self.summary_final_exc(event.excrepr) - if event.exitstatus == 2: + if excrepr is not None: + self.summary_final_exc(excrepr) + if exitstatus == 2: self.write_sep("!", "KEYBOARD INTERRUPT") self.summary_deselected() self.summary_stats() @@ -246,7 +246,7 @@ class TerminalReporter: self.write_line("### Watching: %s" %(rootdir,), bold=True) # - # summaries for TestrunFinish + # summaries for testrunfinish # def summary_failures(self): @@ -322,7 +322,7 @@ class CollectonlyReporter: self._failed.append(event) self.indent = self.indent[:-len(self.INDENT)] - def pyevent__testrunfinish(self, event): + def pyevent__testrunfinish(self, exitstatus, excrepr=None): if self._failed: self.out.sep("!", "collection failures") for event in self._failed: @@ -378,7 +378,7 @@ class TestTerminal: linecomp.assert_contains_lines([ "*test_pass_skip_fail.py .sF" ]) - rep.config.bus.notify("testrunfinish", event.TestrunFinish()) + rep.config.bus.notify("testrunfinish", exitstatus=1) linecomp.assert_contains_lines([ " def test_func():", "> assert 0", @@ -411,7 +411,7 @@ class TestTerminal: "*test_pass_skip_fail_verbose.py:4: *test_skip*SKIP*", "*test_pass_skip_fail_verbose.py:6: *test_func*FAIL*", ]) - rep.config.bus.notify("testrunfinish", event.TestrunFinish()) + rep.config.bus.notify("testrunfinish", exitstatus=1) linecomp.assert_contains_lines([ " def test_func():", "> assert 0", @@ -428,7 +428,7 @@ class TestTerminal: linecomp.assert_contains_lines([ "*test_collect_fail.py F*" ]) - rep.config.bus.notify("testrunfinish", event.TestrunFinish()) + rep.config.bus.notify("testrunfinish", exitstatus=1) linecomp.assert_contains_lines([ "> import xyz", "E ImportError: No module named xyz" @@ -522,7 +522,7 @@ class TestTerminal: rep.config.bus.notify("testrunstart") for item in testdir.genitems([modcol]): rep.config.bus.notify("itemtestreport", basic_run_report(item)) - rep.config.bus.notify("testrunfinish", event.TestrunFinish()) + rep.config.bus.notify("testrunfinish", exitstatus=1) s = linecomp.stringio.getvalue() if tbopt == "long": print s @@ -577,7 +577,7 @@ class TestTerminal: s = linecomp.stringio.getvalue() if not verbose: assert s.find("_keyboard_interrupt.py Fs") != -1 - bus.notify("testrunfinish", event.TestrunFinish(exitstatus=2, excinfo=excinfo)) + bus.notify("testrunfinish", exitstatus=2, excrepr=excinfo.getrepr()) text = linecomp.stringio.getvalue() linecomp.assert_contains_lines([ " def test_foobar():", diff --git a/py/test/session.py b/py/test/session.py index 5330a84a8..2959257d9 100644 --- a/py/test/session.py +++ b/py/test/session.py @@ -91,7 +91,8 @@ class Session(object): def sessionfinishes(self, exitstatus=0, excinfo=None): """ teardown any resources after a test run. """ self.bus.notify("testrunfinish", - event.TestrunFinish(exitstatus=exitstatus, excinfo=excinfo)) + exitstatus=exitstatus, + excrepr=excinfo and excinfo.getrepr() or None) def getinitialitems(self, colitems): if colitems is None: