[svn r63685] internal renaming of variable name

--HG--
branch : trunk

py/test/dist/dsession.py

@@ -24,15 +24,15 @@ class LoopState(object):
         self.shuttingdown = False
         self.testsfailed = False
 
-    def pyevent__itemtestreport(self, event):
+    def pyevent__itemtestreport(self, rep):
-        if event.colitem in self.dsession.item2nodes:
+        if rep.colitem in self.dsession.item2nodes:
-            self.dsession.removeitem(event.colitem, event.node)
+            self.dsession.removeitem(rep.colitem, rep.node)
-        if event.failed:
+        if rep.failed:
             self.testsfailed = True
 
-    def pyevent__collectionreport(self, event):
+    def pyevent__collectionreport(self, rep):
-        if event.passed:
+        if rep.passed:
-            self.colitems.extend(event.result)
+            self.colitems.extend(rep.result)
 
     def pyevent__testnodeready(self, node):
         self.dsession.addnode(node)

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):
+    def pyevent__itemtestreport(self, rep):
-        self.sendevent("itemtestreport", report)
+        self.sendevent("itemtestreport", rep)
 
     def run(self):
         channel = self.channel

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):
+        def pyevent__itemtestreport(self, rep):
-            if ev.failed:
+            if rep.failed:
-                self.append(ev)
+                self.append(rep)
         pyevent__collectionreport = pyevent__itemtestreport
         
     failreports = Failures()

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):

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):
+    def pyevent__itemtestreport(self, rep):
-        code = event.shortrepr 
+        code = rep.shortrepr 
-        if event.passed:
+        if rep.passed:
             longrepr = ""
-        elif event.failed:
+        elif rep.failed:
-            longrepr = str(event.longrepr) 
+            longrepr = str(rep.longrepr) 
-        elif event.skipped:
+        elif rep.skipped:
-            longrepr = str(event.longrepr.reprcrash.message)
+            longrepr = str(rep.longrepr.reprcrash.message)
-        self.log_outcome(event, code, longrepr) 
+        self.log_outcome(rep, code, longrepr) 
 
-    def pyevent__collectionreport(self, event):
+    def pyevent__collectionreport(self, rep):
-        if not event.passed:
+        if not rep.passed:
-            if event.failed: 
+            if rep.failed: 
                 code = "F"
             else:
-                assert event.skipped
+                assert rep.skipped
                 code = "S"
-            longrepr = str(event.longrepr.reprcrash)
+            longrepr = str(rep.longrepr.reprcrash)
-            self.log_outcome(event, code, longrepr)    
+            self.log_outcome(rep, code, longrepr)    
 
     def pyevent__internalerror(self, excrepr):
         path = excrepr.reprcrash.path 

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):
+    def getoutcomeletter(self, rep):
-        return event.shortrepr 
+        return rep.shortrepr 
 
-    def getoutcomeword(self, event):
+    def getoutcomeword(self, rep):
-        if event.passed: 
+        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):
+    def pyevent__itemtestreport(self, rep):
-        fspath = event.colitem.fspath 
+        fspath = rep.colitem.fspath 
-        cat, letter, word = self.getcategoryletterword(event)
+        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'):
+                if hasattr(rep, 'node'):
-                    self._tw.write("%s " % event.node.gateway.id)
+                    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):
+    def pyevent__collectionreport(self, rep):
-        if not event.passed:
+        if not rep.passed:
-            if event.failed:
+            if rep.failed:
-                self.stats.setdefault("failed", []).append(event)
+                self.stats.setdefault("failed", []).append(rep)
-                msg = event.longrepr.reprcrash.message 
+                msg = rep.longrepr.reprcrash.message 
-                self.write_fspath_result(event.colitem.fspath, "F")
+                self.write_fspath_result(rep.colitem.fspath, "F")
-            elif event.skipped:
+            elif rep.skipped:
-                self.stats.setdefault("skipped", []).append(event)
+                self.stats.setdefault("skipped", []).append(rep)
-                self.write_fspath_result(event.colitem.fspath, "S")
+                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):
+    def pyevent__collectionreport(self, rep):
-        if not event.passed:
+        if not rep.passed:
-            self.outindent("!!! %s !!!" % event.longrepr.reprcrash.message)
+            self.outindent("!!! %s !!!" % rep.longrepr.reprcrash.message)
-            self._failed.append(event)
+            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:
+        for rep in self._failed:
-            event.toterminal(self.out)
+            rep.toterminal(self.out)
                 
 def folded_skips(skipped):
     d = {}

py/test/session.py

@@ -43,11 +43,11 @@ class Session(object):
             else:
                 assert isinstance(next, Collector)
                 notify("collectionstart", next)
-                ev = basic_collect_report(next)
+                rep = basic_collect_report(next)
-                if ev.passed:
+                if rep.passed:
-                    for x in self.genitems(ev.result, keywordexpr):
+                    for x in self.genitems(rep.result, keywordexpr):
                         yield x 
-                notify("collectionreport", ev)
+                notify("collectionreport", rep)
             if self.shouldstop:
                 break
 

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):