[py-svn] r57291 - py/branch/event/py/test2/report

[hpk at codespeak.net]

Author: hpk
Date: Fri Aug 15 18:07:04 2008
New Revision: 57291

Modified:
   py/branch/event/py/test2/report/terminal.py
Log:
fix random newlines. 


Modified: py/branch/event/py/test2/report/terminal.py
==============================================================================
--- py/branch/event/py/test2/report/terminal.py	(original)
+++ py/branch/event/py/test2/report/terminal.py	Fri Aug 15 18:07:04 2008
@@ -27,13 +27,20 @@
             self.currentfspath = fspath
         self._tw.write(res)
 
-    def write_line(self, line, **markup):
-        line = str(line)
+    def ensure_newline(self):
         if self.currentfspath:
             self._tw.line()
             self.currentfspath = None
+
+    def write_line(self, line, **markup):
+        line = str(line)
+        self.ensure_newline()
         self._tw.line(line, **markup)
 
+    def write_sep(self, sep, title=None, **markup):
+        self.ensure_newline()
+        self._tw.sep(sep, title, **markup)
+
     def getoutcomeword(self, item):
         if item.passed: return self._tw.markup("PASS", green=True)
         elif item.failed: return self._tw.markup("FAIL", red=True)
@@ -86,7 +93,7 @@
 
     def rep_TestrunStart(self, ev):
         super(TerminalReporter, self).rep_TestrunStart(ev)
-        self._tw.sep("=", "test session starts", bold=True)
+        self.write_sep("=", "test session starts", bold=True)
         self._sessionstarttime = py.std.time.time()
         #self.out_hostinfo()
 
@@ -96,22 +103,20 @@
             self.summary_failures()
             self.summary_skips()
         elif ev.exitstatus == 2:
-            self._tw.sep("!", "KEYBOARD INTERRUPT")
-        self._tw.line()
+            self.write_sep("!", "KEYBOARD INTERRUPT")
         self.summary_deselected()
         self.summary_stats()
 
     def rep_LooponfailingInfo(self, ev):
         if ev.failreports:
-            self._tw.sep("#", "LOOPONFAILING", red=True)
+            self.write_sep("#", "LOOPONFAILING", red=True)
             for report in ev.failreports:
                 try:
                     loc = report.outcome.longrepr.reprcrash
                 except AttributeError:
                     loc = str(report.outcome.longrepr)[:50]
                 self.write_line(loc, red=True)
-        #self.write_line("watching files below:")
-        self._tw.sep("#", "waiting for changes")
+        self.write_sep("#", "waiting for changes")
         for rootdir in ev.rootdirs:
             self.write_line("### Watching:   %s" %(rootdir,), bold=True)
 
@@ -133,9 +138,9 @@
 
     def summary_failures(self):
         if self._failed:
-            self._tw.sep("=", "FAILURES")
+            self.write_sep("=", "FAILURES")
             for ev in self._failed:
-                self._tw.sep("_")
+                self.write_sep("_")
                 ev.toterminal(self._tw)
 
     def summary_stats(self):
@@ -144,18 +149,17 @@
         numskipped = len(self._skipped)
         numpassed = len(self._passed)
         sum = numfailed + numpassed
-        self._tw.sep("=", "%d/%d passed + %d skips in %.2f seconds" %
+        self.write_sep("=", "%d/%d passed + %d skips in %.2f seconds" %
                       (numpassed, sum, numskipped, session_duration), bold=True)
         if numfailed == 0:
-            self._tw.sep("=", "failures: no failures :)", green=True)
+            self.write_sep("=", "failures: no failures :)", green=True)
         else:
-            self._tw.sep("=", "failures: %d" %(numfailed), red=True)
-        self._tw.line()
+            self.write_sep("=", "failures: %d" %(numfailed), red=True)
 
     def summary_deselected(self):
         if not self._deselected:
             return
-        self._tw.sep("=", "%d tests deselected by %r" %(
+        self.write_sep("=", "%d tests deselected by %r" %(
             len(self._deselected), self.config.option.keyword), bold=True)
                                                 
 
@@ -163,7 +167,7 @@
         if not self._failed or self.config.option.showskipsummary:
             folded_skips = self._folded_skips()
             if folded_skips:
-                self._tw.sep("_", "skipped test summary")
+                self.write_sep("_", "skipped test summary")
                 for num, fspath, lineno, reason in folded_skips:
                     self._tw.line("%s:%d: [%d] %s" %(fspath, lineno, num, reason))