[Checkins] SVN: zope.testrunner/trunk/ Show more information about layers whose setup fails (LP #638153).

[Tres Seaver]

Log message for revision 116424:
  Show more information about layers whose setup fails (LP #638153).
  

Changed:
  U   zope.testrunner/trunk/CHANGES.txt
  U   zope.testrunner/trunk/src/zope/testrunner/runner.py
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test

-=-
Modified: zope.testrunner/trunk/CHANGES.txt
===================================================================
--- zope.testrunner/trunk/CHANGES.txt	2010-09-15 00:14:19 UTC (rev 116423)
+++ zope.testrunner/trunk/CHANGES.txt	2010-09-15 04:11:02 UTC (rev 116424)
@@ -1,11 +1,19 @@
 zope.testrunner Changelog
 *************************
 
+After 4.0.0b5 (unreleased)
+==========================
+
+- Show more information about layers whose setup fails (LP #638153).
+
+
 4.0.0b5 (2010-07-20)
 ====================
 
 - Update fix for LP #221151 to a spelliing compatible with Python 2.4.
+
 - Timestamps are now always included in subunit output (r114849).
+
 - LP #591309: fix a crash when subunit reports test failures containing
   UTF8-encoded data.
 

Modified: zope.testrunner/trunk/src/zope/testrunner/runner.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/runner.py	2010-09-15 00:14:19 UTC (rev 116423)
+++ zope.testrunner/trunk/src/zope/testrunner/runner.py	2010-09-15 04:11:02 UTC (rev 116424)
@@ -371,7 +371,7 @@
         f = cStringIO.StringIO()
         traceback.print_exc(file=f)
         output.error(f.getvalue())
-        errors.append((SetUpLayerFailure(), sys.exc_info()))
+        errors.append((SetUpLayerFailure(layer), sys.exc_info()))
         return 0
     else:
         return run_tests(options, tests, layer_name, failures, errors)
@@ -379,10 +379,17 @@
 
 class SetUpLayerFailure(unittest.TestCase):
 
+    def __init__(self, layer):
+        super(SetUpLayerFailure, self).__init__()
+        self.layer = layer
+
     def runTest(self):
-        "Layer set up failure."
+        pass
 
+    def __str__(self):
+        return "Layer: %s" % self.layer
 
+
 def spawn_layer_in_subprocess(result, script_parts, options, features,
                               layer_name, layer, failures, errors,
                               resume_number):

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test	2010-09-15 00:14:19 UTC (rev 116423)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test	2010-09-15 04:11:02 UTC (rev 116424)
@@ -105,7 +105,7 @@
     Running tests2.Layer2 tests:
       Tear down tests2.Layer1 ... not supported
       Running in a subprocess.
-      Set up tests2.Layer2 
+      Set up tests2.Layer2
     **********************************************************************
     <BLANKLINE>
     Can't post-mortem debug when running a layer as a subprocess!
@@ -120,7 +120,7 @@
     <BLANKLINE>
     <BLANKLINE>
     Tests with errors:
-       runTest (zope.testrunner.runner.SetUpLayerFailure)
+       Layer: tests2.Layer2
     Total: 1 tests, 0 failures, 1 errors in 0.210 seconds.
     True