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

[arigo at codespeak.net]

Author: arigo
Date: Mon Feb 13 00:59:11 2006
New Revision: 23264

Modified:
   py/dist/py/test/terminal/terminal.py
Log:
Report skipped and other special outcomes of Modules (if any).  This is meant
for the case where the module calls py.test.skip() when it is imported.  Now
we get e.g.:

   pypy/objspace/std/test/test_complexobject - skipped



Modified: py/dist/py/test/terminal/terminal.py
==============================================================================
--- py/dist/py/test/terminal/terminal.py	(original)
+++ py/dist/py/test/terminal/terminal.py	Mon Feb 13 00:59:11 2006
@@ -100,9 +100,13 @@
                 import pdb
                 self.out.rewrite('\n%s\n' % (outcome.excinfo.exconly(),))
                 pdb.post_mortem(outcome.excinfo._excinfo[2])
-        if (isinstance(outcome, py.test.Item.Failed) and 
-            isinstance(colitem, py.test.collect.Module)): 
-                self.out.line(" FAILED TO LOAD MODULE") 
+        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(" - ?")
         if isinstance(colitem, py.test.Item): 
             if self.config.option.verbose >= 1: 
                 resultstring = self.repr_progress_long_result(colitem, outcome)