[py-svn] r33753 - py/dist/py/test/rsession

[fijal at codespeak.net]

Author: fijal
Date: Thu Oct 26 12:54:58 2006
New Revision: 33753

Modified:
   py/dist/py/test/rsession/rsession.py
Log:
Remove nasty hack, but I think we need tests for that.


Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py	(original)
+++ py/dist/py/test/rsession/rsession.py	Thu Oct 26 12:54:58 2006
@@ -45,8 +45,8 @@
         self.skipped = dict([(host, 0) for host in hosts])
         self.passed = dict([(host, 0) for host in hosts])
         # XXX: This is for tests to work
-        self.count = 0
-        self.lgt = 1000
+        #self.count = 0
+        #self.lgt = 1000
 
     def report(self, what):
         repfun = getattr(self, "report_" + what.__class__.__name__, 
@@ -249,10 +249,10 @@
             "/".join(colitem.listnames())
                 
     def report_FailedTryiter(self, event):
-        self.out.line("FAILED TO LOAD MODULE: %s" % "/".join(event.item.listnames()))
+        self.out.line("FAILED TO LOAD MODULE: %s\n" % "/".join(event.item.listnames()))
     
     def report_SkippedTryiter(self, event):
-        self.out.line("Skipped (%s) %s" % (str(event.excinfo.value), "/".
+        self.out.line("Skipped (%s) %s\n" % (str(event.excinfo.value), "/".
             join(event.item.listnames())))
 
 class LocalReporter(AbstractReporter):
@@ -263,10 +263,12 @@
         return "/".join(colitem.listnames())
     
     def report_SkippedTryiter(self, event):
-        self.out.write("- skipped (%s)\n" % event.excinfo.value)
+        #self.show_item(event.item, False)
+        self.out.write("- skipped (%s)" % event.excinfo.value)
     
     def report_FailedTryiter(self, event):
-        self.out.write("- FAILED TO LOAD MODULE\n")
+        #self.show_item(event.item, False)
+        self.out.write("- FAILED TO LOAD MODULE")
     
     def report_ReceivedItemOutcome(self, event):
         if event.outcome.passed:
@@ -281,20 +283,22 @@
             self.failed_tests_outcome.append(event)
             self.out.write("F")
             # we'll take care of them later
-        self.count += 1
-        if self.count >= self.lgt:
-            self.out.write("\n")
+        #self.count += 1
+        #if self.count >= self.lgt:
+        #    self.out.write("\n")
         #itempath = " ".join(event.item.listnames()[1:])
         #print "%10s: %s %s" %(sshhost[:10], status, itempath)
     
     def report_ItemStart(self, event):
-        item = event.item
+        self.show_item(event.item)
+    
+    def show_item(self, item, count_elems = True):
         if isinstance(item, py.test.collect.Module):
             # XXX This is a terrible hack, I don't like it
             #     and will rewrite it at some point
-            self.count = 0
-            lgt = len(list(event.item.tryiter()))
-            self.lgt = lgt
+            #self.count = 0
+            lgt = len(list(item.tryiter()))
+            #self.lgt = lgt
             # print names relative to current workdir
             name = "/".join(item.listnames())
             local = str(py.path.local())
@@ -303,9 +307,7 @@
                 local = local[len(d) + 1:]
             if name.startswith(local):
                 name = name[len(local) + 1:]
-            self.out.write("%s[%d] " % (name, lgt))
-            if lgt == 0:
-                self.out.write("\n")
+            self.out.write("\n%s[%d] " % (name, lgt))
     
     def hangs(self):
         pass