From c516e895fdeedd1c7181641a2a140066cdbda581 Mon Sep 17 00:00:00 2001 From: hpk Date: Sun, 5 Apr 2009 22:16:27 +0200 Subject: [PATCH] [svn r63685] internal renaming of variable name --HG-- branch : trunk --- py/test/dist/dsession.py | 14 ++++---- py/test/dist/txnode.py | 4 +-- py/test/looponfail/remote.py | 6 ++-- py/test/plugin/api.py | 4 +-- py/test/plugin/pytest_resultlog.py | 28 +++++++-------- py/test/plugin/pytest_terminal.py | 58 +++++++++++++++--------------- py/test/session.py | 8 ++--- py/test/testing/test_runner.py | 2 +- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/py/test/dist/dsession.py b/py/test/dist/dsession.py index ad43ffd43..e97ec8e59 100644 --- a/py/test/dist/dsession.py +++ b/py/test/dist/dsession.py @@ -24,15 +24,15 @@ class LoopState(object): self.shuttingdown = False self.testsfailed = False - def pyevent__itemtestreport(self, event): - if event.colitem in self.dsession.item2nodes: - self.dsession.removeitem(event.colitem, event.node) - if event.failed: + def pyevent__itemtestreport(self, rep): + if rep.colitem in self.dsession.item2nodes: + self.dsession.removeitem(rep.colitem, rep.node) + if rep.failed: self.testsfailed = True - def pyevent__collectionreport(self, event): - if event.passed: - self.colitems.extend(event.result) + def pyevent__collectionreport(self, rep): + if rep.passed: + self.colitems.extend(rep.result) def pyevent__testnodeready(self, node): self.dsession.addnode(node) diff --git a/py/test/dist/txnode.py b/py/test/dist/txnode.py index 333ef320c..d0101cf3f 100644 --- a/py/test/dist/txnode.py +++ b/py/test/dist/txnode.py @@ -104,8 +104,8 @@ class SlaveNode(object): def sendevent(self, eventname, *args, **kwargs): self.channel.send((eventname, args, kwargs)) - def pyevent__itemtestreport(self, report): - self.sendevent("itemtestreport", report) + def pyevent__itemtestreport(self, rep): + self.sendevent("itemtestreport", rep) def run(self): channel = self.channel diff --git a/py/test/looponfail/remote.py b/py/test/looponfail/remote.py index e26d032e2..0353d2ccc 100644 --- a/py/test/looponfail/remote.py +++ b/py/test/looponfail/remote.py @@ -137,9 +137,9 @@ def slave_runsession(channel, config, fullwidth, hasmarkup): session.shouldclose = channel.isclosed class Failures(list): - def pyevent__itemtestreport(self, ev): - if ev.failed: - self.append(ev) + def pyevent__itemtestreport(self, rep): + if rep.failed: + self.append(rep) pyevent__collectionreport = pyevent__itemtestreport failreports = Failures() diff --git a/py/test/plugin/api.py b/py/test/plugin/api.py index 1b6dcff26..0918556ec 100644 --- a/py/test/plugin/api.py +++ b/py/test/plugin/api.py @@ -82,7 +82,7 @@ class Events: def pyevent__itemstart(self, item, node=None): """ test item gets collected. """ - def pyevent__itemtestreport(self, event): + def pyevent__itemtestreport(self, rep): """ test has been run. """ def pyevent__item_runtest_finished(self, item, excinfo, outerr): @@ -97,7 +97,7 @@ class Events: def pyevent__collectionstart(self, collector): """ collector starts collecting. """ - def pyevent__collectionreport(self, event): + def pyevent__collectionreport(self, rep): """ collector finished collecting. """ def pyevent__testrunstart(self): diff --git a/py/test/plugin/pytest_resultlog.py b/py/test/plugin/pytest_resultlog.py index 55103375d..2b9684f87 100644 --- a/py/test/plugin/pytest_resultlog.py +++ b/py/test/plugin/pytest_resultlog.py @@ -58,25 +58,25 @@ class ResultLog(object): testpath = generic_path(event.colitem) self.write_log_entry(testpath, shortrepr, longrepr) - def pyevent__itemtestreport(self, event): - code = event.shortrepr - if event.passed: + def pyevent__itemtestreport(self, rep): + code = rep.shortrepr + if rep.passed: longrepr = "" - elif event.failed: - longrepr = str(event.longrepr) - elif event.skipped: - longrepr = str(event.longrepr.reprcrash.message) - self.log_outcome(event, code, longrepr) + elif rep.failed: + longrepr = str(rep.longrepr) + elif rep.skipped: + longrepr = str(rep.longrepr.reprcrash.message) + self.log_outcome(rep, code, longrepr) - def pyevent__collectionreport(self, event): - if not event.passed: - if event.failed: + def pyevent__collectionreport(self, rep): + if not rep.passed: + if rep.failed: code = "F" else: - assert event.skipped + assert rep.skipped code = "S" - longrepr = str(event.longrepr.reprcrash) - self.log_outcome(event, code, longrepr) + longrepr = str(rep.longrepr.reprcrash) + self.log_outcome(rep, code, longrepr) def pyevent__internalerror(self, excrepr): path = excrepr.reprcrash.path diff --git a/py/test/plugin/pytest_terminal.py b/py/test/plugin/pytest_terminal.py index b58f94525..a29666124 100644 --- a/py/test/plugin/pytest_terminal.py +++ b/py/test/plugin/pytest_terminal.py @@ -69,15 +69,15 @@ class TerminalReporter: break return cat, self.getoutcomeletter(event), self.getoutcomeword(event) - def getoutcomeletter(self, event): - return event.shortrepr + def getoutcomeletter(self, rep): + return rep.shortrepr - def getoutcomeword(self, event): - if event.passed: + def getoutcomeword(self, rep): + if rep.passed: return "PASS", dict(green=True) - elif event.failed: + elif rep.failed: return "FAIL", dict(red=True) - elif event.skipped: + elif rep.skipped: return "SKIP" else: return "???", dict(red=True) @@ -161,38 +161,38 @@ class TerminalReporter: def pyevent__deselected(self, items): self.stats.setdefault('deselected', []).append(items) - def pyevent__itemtestreport(self, event): - fspath = event.colitem.fspath - cat, letter, word = self.getcategoryletterword(event) + def pyevent__itemtestreport(self, rep): + fspath = rep.colitem.fspath + cat, letter, word = self.getcategoryletterword(rep) if isinstance(word, tuple): word, markup = word else: markup = {} - self.stats.setdefault(cat, []).append(event) + self.stats.setdefault(cat, []).append(rep) if not self.config.option.verbose: self.write_fspath_result(fspath, letter) else: - info = event.colitem.repr_metainfo() + info = rep.colitem.repr_metainfo() line = info.verboseline(basedir=self.curdir) + " " - if not hasattr(event, 'node'): + if not hasattr(rep, 'node'): self.write_ensure_prefix(line, word, **markup) else: self.ensure_newline() - if hasattr(event, 'node'): - self._tw.write("%s " % event.node.gateway.id) + if hasattr(rep, 'node'): + self._tw.write("%s " % rep.node.gateway.id) self._tw.write(word, **markup) self._tw.write(" " + line) self.currentfspath = -2 - def pyevent__collectionreport(self, event): - if not event.passed: - if event.failed: - self.stats.setdefault("failed", []).append(event) - msg = event.longrepr.reprcrash.message - self.write_fspath_result(event.colitem.fspath, "F") - elif event.skipped: - self.stats.setdefault("skipped", []).append(event) - self.write_fspath_result(event.colitem.fspath, "S") + def pyevent__collectionreport(self, rep): + if not rep.passed: + if rep.failed: + self.stats.setdefault("failed", []).append(rep) + msg = rep.longrepr.reprcrash.message + self.write_fspath_result(rep.colitem.fspath, "F") + elif rep.skipped: + self.stats.setdefault("skipped", []).append(rep) + self.write_fspath_result(rep.colitem.fspath, "S") def pyevent__testrunstart(self): self.write_sep("=", "test session starts", bold=True) @@ -316,17 +316,17 @@ class CollectonlyReporter: def pyevent__itemstart(self, item, node=None): self.outindent(item) - def pyevent__collectionreport(self, event): - if not event.passed: - self.outindent("!!! %s !!!" % event.longrepr.reprcrash.message) - self._failed.append(event) + def pyevent__collectionreport(self, rep): + if not rep.passed: + self.outindent("!!! %s !!!" % rep.longrepr.reprcrash.message) + self._failed.append(rep) self.indent = self.indent[:-len(self.INDENT)] def pyevent__testrunfinish(self, exitstatus, excrepr=None): if self._failed: self.out.sep("!", "collection failures") - for event in self._failed: - event.toterminal(self.out) + for rep in self._failed: + rep.toterminal(self.out) def folded_skips(skipped): d = {} diff --git a/py/test/session.py b/py/test/session.py index c66a4b166..bd685edcb 100644 --- a/py/test/session.py +++ b/py/test/session.py @@ -43,11 +43,11 @@ class Session(object): else: assert isinstance(next, Collector) notify("collectionstart", next) - ev = basic_collect_report(next) - if ev.passed: - for x in self.genitems(ev.result, keywordexpr): + rep = basic_collect_report(next) + if rep.passed: + for x in self.genitems(rep.result, keywordexpr): yield x - notify("collectionreport", ev) + notify("collectionreport", rep) if self.shouldstop: break diff --git a/py/test/testing/test_runner.py b/py/test/testing/test_runner.py index 2e0c3d900..617c0deca 100644 --- a/py/test/testing/test_runner.py +++ b/py/test/testing/test_runner.py @@ -77,7 +77,7 @@ class TestSetupState: evrec = testdir.geteventrecorder(item.config) setup = SetupState() setup.do_fixture_and_runtest(item) - rep = evrec.popevent("itemtestreport").event + rep = evrec.popevent("itemtestreport").rep assert rep.passed def test_runtest_fails(self, testdir):