[py-svn] r28665 - py/dist/py/test/terminal

[arigo at codespeak.net]

Author: arigo
Date: Sun Jun 11 13:36:12 2006
New Revision: 28665

Modified:
   py/dist/py/test/terminal/terminal.py
Log:
For module outcomes, use a helper repr_*() method similar to the
repr_*() methods for single test outcomes.  This allows hooking
from custom conftests.



Modified: py/dist/py/test/terminal/terminal.py
==============================================================================
--- py/dist/py/test/terminal/terminal.py	(original)
+++ py/dist/py/test/terminal/terminal.py	Sun Jun 11 13:36:12 2006
@@ -102,12 +102,9 @@
                 self.out.rewrite('\n%s\n' % (outcome.excinfo.exconly(),))
                 pdb.post_mortem(outcome.excinfo._excinfo[2])
         if isinstance(colitem, py.test.collect.Module):
-            if isinstance(outcome, py.test.Item.Failed):
-                self.out.line(" - FAILED TO LOAD MODULE")
-            elif isinstance(outcome, py.test.Item.Skipped):
-                self.out.line(" - skipped")
-            elif not isinstance(outcome, (list, py.test.Item.Passed)):
-                self.out.line(" - ?")
+            resultstring = self.repr_progress_module_result(colitem, outcome)
+            if resultstring:
+                self.out.line(" - " + resultstring)
         if isinstance(colitem, py.test.Item): 
             if self.config.option.verbose >= 1: 
                 resultstring = self.repr_progress_long_result(colitem, outcome)
@@ -200,6 +197,14 @@
             #raise TypeError, "not an Outcome instance: %r" % (outcome,)
             return 'UNKNOWN'
 
+    def repr_progress_module_result(self, item, outcome):
+        if isinstance(outcome, py.test.Item.Failed):
+            return "FAILED TO LOAD MODULE"
+        elif isinstance(outcome, py.test.Item.Skipped):
+            return "skipped"
+        elif not isinstance(outcome, (list, py.test.Item.Passed)):
+            return "?"
+
     # --------------------
     # summary information 
     # --------------------