[Checkins] SVN: zope.testrunner/trunk/ Merge some of the changes from doctest patch branch.

Lennart Regebro regebro at gmail.com
Mon Apr 26 05:50:07 EDT 2010


Log message for revision 111419:
  Merge some of the changes from doctest patch branch.
  

Changed:
  U   zope.testrunner/trunk/CHANGES.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-colors.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-knit.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-ntd.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-layers.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-repeat.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-shuffle.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-simple.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-test-selection.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-verbose.txt

-=-
Modified: zope.testrunner/trunk/CHANGES.txt
===================================================================
--- zope.testrunner/trunk/CHANGES.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/CHANGES.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -4,4 +4,4 @@
 4.0.0 (Unreleased)
 ==================
 
-- Extracted the testrunner from zope.testing.testrunner to it's own module.
\ No newline at end of file
+- Extracted the testrunner from zope.testrunner to it's own module.
\ No newline at end of file

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -18,7 +18,7 @@
       Set up samplelayers.Layer1 in N.NNN seconds.
       Set up samplelayers.Layer11 in N.NNN seconds.
       Set up samplelayers.Layer111 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer111 in N.NNN seconds.
       Tear down samplelayers.Layerx in N.NNN seconds.

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-colors.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-colors.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-colors.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -57,7 +57,7 @@
       Set up samplelayers.Layer1 in {green}0.000{normal} seconds.
       Set up samplelayers.Layer12 in {green}0.000{normal} seconds.
       Set up samplelayers.Layer122 in {green}0.000{normal} seconds.
-    {normal}  Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
+    {normal}  Ran {green}26{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
     {normal}Tearing down left over layers:{normal}
       Tear down samplelayers.Layer122 in {green}0.000{normal} seconds.
       Tear down samplelayers.Layer12 in {green}0.000{normal} seconds.
@@ -77,28 +77,28 @@
     {normal}  Ran {green}9{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.001{normal} seconds.{normal}
     {normal}Running samplelayers.Layer11 tests:{normal}
       Set up samplelayers.Layer11 in {green}0.000{normal} seconds.
-    {normal}  Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
+    {normal}  Ran {green}26{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
     {normal}Running samplelayers.Layer111 tests:{normal}
       Set up samplelayers.Layerx in {green}0.000{normal} seconds.
       Set up samplelayers.Layer111 in {green}0.000{normal} seconds.
-    {normal}  Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.008{normal} seconds.{normal}
+    {normal}  Ran {green}26{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.008{normal} seconds.{normal}
     {normal}Running samplelayers.Layer112 tests:{normal}
       Tear down samplelayers.Layer111 in {green}0.000{normal} seconds.
       Set up samplelayers.Layer112 in {green}0.000{normal} seconds.
-    {normal}  Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.008{normal} seconds.{normal}
+    {normal}  Ran {green}26{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.008{normal} seconds.{normal}
     {normal}Running samplelayers.Layer12 tests:{normal}
       Tear down samplelayers.Layer112 in {green}0.000{normal} seconds.
       Tear down samplelayers.Layerx in {green}0.000{normal} seconds.
       Tear down samplelayers.Layer11 in {green}0.000{normal} seconds.
       Set up samplelayers.Layer12 in {green}0.000{normal} seconds.
-    {normal}  Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
+    {normal}  Ran {green}26{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
     {normal}Running samplelayers.Layer121 tests:{normal}
       Set up samplelayers.Layer121 in {green}0.000{normal} seconds.
-    {normal}  Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
+    {normal}  Ran {green}26{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
     {normal}Running samplelayers.Layer122 tests:{normal}
       Tear down samplelayers.Layer121 in {green}0.000{normal} seconds.
       Set up samplelayers.Layer122 in {green}0.000{normal} seconds.
-    {normal}  Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.008{normal} seconds.{normal}
+    {normal}  Ran {green}26{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.008{normal} seconds.{normal}
     {normal}Running zope.testrunner.layer.UnitTests tests:{normal}
       Tear down samplelayers.Layer122 in {green}0.000{normal} seconds.
       Tear down samplelayers.Layer12 in {green}0.000{normal} seconds.
@@ -116,9 +116,9 @@
     {cyan}    f(){normal}
     Exception raised:
     {red}    Traceback (most recent call last):{normal}
-    {red}      File ".../doctest/__init__.py", line 1356, in __run{normal}
+    {red}      File ".../doctest.py", line 1356, in __run{normal}
     {red}        compileflags, 1) in test.globs{normal}
-    {red}      File "<doctest sample2.sampletests_e.eek[line 2, example 0]>", line 1, in ?{normal}
+    {red}      File "<doctest sample2.sampletests_e.eek[0]>", line 1, in ?{normal}
     {red}        f(){normal}
     {red}      File "testrunner-ex/sample2/sampletests_e.py", line 19, in f{normal}
     {red}        g(){normal}
@@ -154,11 +154,11 @@
     {cyan}    f(){normal}
     Exception raised:
     {red}    Traceback (most recent call last):{normal}
-    {red}      File ".../doctest/__init__.py", line 1356, in __run{normal}
+    {red}      File ".../doctest.py", line 1356, in __run{normal}
     {red}        compileflags, 1) in test.globs{normal}
-    {red}      File "<doctest e.txt[line 4, example 1]>", line 1, in ?{normal}
+    {red}      File "<doctest e.txt[1]>", line 1, in ?{normal}
     {red}        f(){normal}
-    {red}      File "<doctest e.txt[line 1, example 0]>", line 2, in f{normal}
+    {red}      File "<doctest e.txt[0]>", line 2, in f{normal}
     {red}        return x{normal}
     {red}    NameError: global name 'x' is not defined{normal}
     <BLANKLINE>
@@ -174,10 +174,10 @@
     {cyan}    raise self.failureException, \{normal}
     {red}AssertionError: 1 != 0{normal}
     <BLANKLINE>
-    {normal}  Ran {green}200{normal} tests with {boldred}3{normal} failures and {boldred}1{normal} errors in {green}0.045{normal} seconds.{normal}
+    {normal}  Ran {green}164{normal} tests with {boldred}3{normal} failures and {boldred}1{normal} errors in {green}0.045{normal} seconds.{normal}
     {normal}Tearing down left over layers:{normal}
       Tear down zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
-    {normal}Total: {green}413{normal} tests, {boldred}3{normal} failures, {boldred}1{normal} errors in {green}0.023{normal} seconds.{normal}
+    {normal}Total: {green}329{normal} tests, {boldred}3{normal} failures, {boldred}1{normal} errors in {green}0.023{normal} seconds.{normal}
     True
 
 
@@ -335,7 +335,7 @@
       Set up samplelayers.Layer1 in 0.000 seconds.
       Set up samplelayers.Layer12 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -348,7 +348,7 @@
       Set up samplelayers.Layer1 in 0.000 seconds.
       Set up samplelayers.Layer12 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -369,7 +369,7 @@
       Set up samplelayers.Layer1 in 0.000 seconds.
       Set up samplelayers.Layer12 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -393,7 +393,7 @@
       Set up samplelayers.Layer1 in {green}0.000{normal} seconds.
       Set up samplelayers.Layer12 in {green}0.000{normal} seconds.
       Set up samplelayers.Layer122 in {green}0.000{normal} seconds.
-    {normal}  Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
+    {normal}  Ran {green}26{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.007{normal} seconds.{normal}
     {normal}Tearing down left over layers:{normal}
       Tear down samplelayers.Layer122 in {green}0.000{normal} seconds.
       Tear down samplelayers.Layer12 in {green}0.000{normal} seconds.
@@ -412,7 +412,7 @@
       Set up samplelayers.Layer1 in 0.000 seconds.
       Set up samplelayers.Layer12 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -21,34 +21,34 @@
       Ran 9 tests with 0 failures and 0 errors in 0.000 seconds.
     Running samplelayers.Layer11 tests:
       Set up samplelayers.Layer11 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.125 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.125 seconds.
     Running samplelayers.Layer111 tests:
       Set up samplelayers.Layerx in 0.000 seconds.
       Set up samplelayers.Layer111 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.125 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.125 seconds.
     Running samplelayers.Layer112 tests:
       Tear down samplelayers.Layer111 in 0.000 seconds.
       Set up samplelayers.Layer112 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.125 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.125 seconds.
     Running samplelayers.Layer12 tests:
       Tear down samplelayers.Layer112 in 0.000 seconds.
       Tear down samplelayers.Layerx in 0.000 seconds.
       Tear down samplelayers.Layer11 in 0.000 seconds.
       Set up samplelayers.Layer12 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.140 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.140 seconds.
     Running samplelayers.Layer121 tests:
       Set up samplelayers.Layer121 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.125 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.125 seconds.
     Running samplelayers.Layer122 tests:
       Tear down samplelayers.Layer121 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.125 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.125 seconds.
     Running zope.testrunner.layer.UnitTests tests:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
       Tear down samplelayers.Layer1 in 0.000 seconds.
       Set up zope.testrunner.layer.UnitTests in 0.000 seconds.
-      Ran 192 tests with 0 failures and 0 errors in 0.687 seconds.
+      Ran 156 tests with 0 failures and 0 errors in 0.687 seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in 0.000 seconds.
     lines   cov%   module   (path)
@@ -62,7 +62,7 @@
        74   100%   sampletests.test122   (testrunner-ex/sampletests/test122.py)
        48   100%   sampletests.test_one   (testrunner-ex/sampletests/test_one.py)
       112    95%   sampletestsf   (testrunner-ex/sampletestsf.py)
-    Total: 405 tests, 0 failures, 0 errors in 0.630 seconds.
+    Total: 321 tests, 0 failures, 0 errors in 0.630 seconds.
     False
 
 The directory specified with the --coverage option will have been created and

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -45,10 +45,10 @@
       Tear down samplelayers.Layer12 in N.NNN seconds.
       Tear down samplelayers.Layer1 in N.NNN seconds.
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
-    Total: 405 tests, 0 failures, 0 errors in N.NNN seconds.
+    Total: 321 tests, 0 failures, 0 errors in N.NNN seconds.
     False
 
 Bug #251759: The test runner's protection against descending into non-package
@@ -111,18 +111,20 @@
     ...             ' -t set_trace4').split()
     >>> try: testrunner.run_internal(defaults)
     ... finally: sys.stdin = real_stdin
-    Running zope.testrunner.layer.UnitTests tests:...
-    --Return--
-    > doctest.py(351)set_trace()->None
-    -> pdb.Pdb.set_trace(self)
+    Running zope.testrunner.layer.UnitTests tests:
+      Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
+    > testrunner-ex/sample3/sampletests_d.py(NNN)f()
+    -> y = x
     (Pdb) n
-    > testrunner-ex/sample3/sampletests_d.py(42)f()
+    --Return--
+    > ...->None
     -> y = x
     (Pdb) p x
     1
     (Pdb) c
-      Ran 1 tests with 0 failures and 0 errors in 0.002 seconds.
-    ...
+      Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
+    Tearing down left over layers:
+      Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
 
 Using pdb in a docstring-based doctest
@@ -132,18 +134,20 @@
     ...             ' -t set_trace3').split()
     >>> try: testrunner.run_internal(defaults)
     ... finally: sys.stdin = real_stdin
-    Running zope.testrunner.layer.UnitTests tests:...
-    --Return--
-    > doctest.py(351)set_trace()->None
-    -> pdb.Pdb.set_trace(self)
+    Running zope.testrunner.layer.UnitTests tests:
+      Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
+    > <doctest sample3.sampletests_d.set_trace3[1]>(3)?()
+    -> y = x
     (Pdb) n
-    > <doctest sample3.sampletests_d.set_trace3[line 3, example 1]>(3)...()
+    --Return--
+    > ...->None
     -> y = x
     (Pdb) p x
     1
     (Pdb) c
-      Ran 1 tests with 0 failures and 0 errors in 0.002 seconds.
-    ...
+      Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
+    Tearing down left over layers:
+      Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
 
 Using pdb.set_trace in a doc file:
@@ -154,21 +158,22 @@
     ...             ' -t set_trace5').split()
     >>> try: testrunner.run_internal(defaults)
     ... finally: sys.stdin = real_stdin
-    Running zope.testrunner.layer.UnitTests tests:...
-    --Return--
-    > doctest.py(351)set_trace()->None
-    -> pdb.Pdb.set_trace(self)
+    Running zope.testrunner.layer.UnitTests tests:
+      Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
+    > <doctest set_trace5.txt[1]>(3)?()
+    -> y = x
     (Pdb) n
-    > <doctest set_trace5.txt[line 2, example 1]>(3)...()
+    --Return--
+    > ...->None
     -> y = x
     (Pdb) p x
     1
     (Pdb) c
-      Ran 1 tests with 0 failures and 0 errors in 0.002 seconds.
-    ...
+      Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
+    Tearing down left over layers:
+      Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
 
-
 Using pdb.set_trace in a function called by a doctest in a doc file:
 
 
@@ -177,18 +182,20 @@
     ...             ' -t set_trace6').split()
     >>> try: testrunner.run_internal(defaults)
     ... finally: sys.stdin = real_stdin
-    Running zope.testrunner.layer.UnitTests tests:...
-    --Return--
-    > doctest.py(351)set_trace()->None
-    -> pdb.Pdb.set_trace(self)
+    Running zope.testrunner.layer.UnitTests tests:
+      Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
+    > testrunner-ex/sample3/sampletests_d.py(NNN)f()
+    -> y = x
     (Pdb) n
-    > testrunner-ex/sample3/sampletests_d.py(42)f()
+    --Return--
+    > ...->None
     -> y = x
     (Pdb) p x
     1
     (Pdb) c
-      Ran 1 tests with 0 failures and 0 errors in 0.002 seconds.
-    ...
+      Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
+    Tearing down left over layers:
+      Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
 
 Post-mortem debugging function called from ordinary test:
@@ -235,21 +242,11 @@
     <BLANKLINE>
     Error in test post_mortem3 (sample3.sampletests_d)
     Traceback (most recent call last):
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in debug
-        runner.run(self._dt_test, clear_globs=False)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in run
-        r = DocTestRunner.run(self, test, compileflags, out, False)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in run
-        return self.__run(test, compileflags, out)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in __run
-        exc_info)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in report_unexpected_exception
-        raise UnexpectedException(test, example, exc_info)
-    UnexpectedException: testrunner-ex/sample3/sampletests_d.py:61 (2 examples)>
+    UnexpectedException: testrunner-ex/sample3/sampletests_d.py:NNN (2 examples)>
     <BLANKLINE>
     exceptions.ValueError:
     <BLANKLINE>
-    > <doctest sample3.sampletests_d.post_mortem3[line 3, example 1]>(1)...()
+    > <doctest sample3.sampletests_d.post_mortem3[1]>(1)?()
     (Pdb) p x
     1
     (Pdb) c
@@ -269,16 +266,6 @@
     <BLANKLINE>
     Error in test post_mortem4 (sample3.sampletests_d)
     Traceback (most recent call last):
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in debug
-        runner.run(self._dt_test, clear_globs=False)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in run
-        r = DocTestRunner.run(self, test, compileflags, out, False)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in run
-        return self.__run(test, compileflags, out)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in __run
-        exc_info)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in report_unexpected_exception
-        raise UnexpectedException(test, example, exc_info)
     UnexpectedException: testrunner-ex/sample3/sampletests_d.py:NNN (1 example)>
     <BLANKLINE>
     exceptions.ValueError:
@@ -304,27 +291,18 @@
     <BLANKLINE>
     Error testrunner-ex/sample3/post_mortem5.txt
     Traceback (most recent call last):
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in debug
-        runner.run(self._dt_test, clear_globs=False)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in run
-        r = DocTestRunner.run(self, test, compileflags, out, False)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in run
-        return self.__run(test, compileflags, out)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in __run
-        exc_info)
-      File ".../zope/testing/doctest/__init__.py", Line NNN, in report_unexpected_exception
-        raise UnexpectedException(test, example, exc_info)
     UnexpectedException: testrunner-ex/sample3/post_mortem5.txt:0 (2 examples)>
     <BLANKLINE>
     exceptions.ValueError:
     <BLANKLINE>
-    > <doctest post_mortem5.txt[line 2, example 1]>(1)...()
+    > <doctest post_mortem5.txt[1]>(1)?()
     (Pdb) p x
     1
     (Pdb) c
     True
 
 
+
 Post-mortem debugging function called from file-based doctest:
 
     >>> sys.stdin = Input('p x\nc')

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -42,9 +42,9 @@
         f()
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_e.eek[line 2, example 0]>", line 1, in ?
+          File "<doctest sample2.sampletests_e.eek[0]>", line 1, in ?
             f()
           File "testrunner-ex/sample2/sampletests_e.py", line 19, in f
             g()
@@ -78,11 +78,11 @@
         f()
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest e.txt[line 4, example 1]>", line 1, in ?
+          File "<doctest e.txt[1]>", line 1, in ?
             f()
-          File "<doctest e.txt[line 1, example 0]>", line 2, in f
+          File "<doctest e.txt[0]>", line 2, in f
             return x
         NameError: global name 'x' is not defined
     <BLANKLINE>
@@ -96,10 +96,10 @@
         raise self.failureException, \
     AssertionError: 1 != 0
     <BLANKLINE>
-      Ran 200 tests with 3 failures and 1 errors in N.NNN seconds.
+      Ran 164 tests with 3 failures and 1 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
-    Total: 413 tests, 3 failures, 1 errors in N.NNN seconds.
+    Total: 329 tests, 3 failures, 1 errors in N.NNN seconds.
     True
 
 We see that we get an error report and a traceback for the failing
@@ -129,9 +129,9 @@
         f()
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_e.eek[line 2, example 0]>", line 1, in ?
+          File "<doctest sample2.sampletests_e.eek[0]>", line 1, in ?
             f()
           File "testrunner-ex/sample2/sampletests_e.py", line 19, in f
             g()
@@ -166,11 +166,11 @@
         f()
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest e.txt[line 4, example 1]>", line 1, in ?
+          File "<doctest e.txt[1]>", line 1, in ?
             f()
-          File "<doctest e.txt[line 1, example 0]>", line 2, in f
+          File "<doctest e.txt[0]>", line 2, in f
             return x
         NameError: global name 'x' is not defined
     <BLANKLINE>
@@ -186,7 +186,7 @@
     <BLANKLINE>
     ................................................................................................
     <BLANKLINE>
-      Ran 200 tests with 3 failures and 1 errors in 0.040 seconds.
+      Ran 164 tests with 3 failures and 1 errors in 0.040 seconds.
     ...
     <BLANKLINE>
     Tests with errors:
@@ -207,22 +207,21 @@
     Running zope.testrunner.layer.UnitTests tests:
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
       Running:
-        1/56 (1.8%)
+        1/47 (2.1%)
     <BLANKLINE>
     Failure in test eek (sample2.sampletests_e)
     Failed doctest test for sample2.sampletests_e.eek
       File "testrunner-ex/sample2/sampletests_e.py", line 28, in eek
     <BLANKLINE>
     ----------------------------------------------------------------------
-    File "testrunner-ex/sample2/sampletests_e.py", line 30,
-           in sample2.sampletests_e.eek
+    File "testrunner-ex/sample2/sampletests_e.py", line 30, in sample2.sampletests_e.eek
     Failed example:
         f()
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_e.eek[line 2, example 0]>", line 1, in ?
+          File "<doctest sample2.sampletests_e.eek[0]>", line 1, in ?
             f()
           File "testrunner-ex/sample2/sampletests_e.py", line 19, in f
             g()
@@ -231,11 +230,11 @@
            - __traceback_info__: I don't know what Y should be.
         NameError: global name 'y' is not defined
     <BLANKLINE>
-        2/56 (3.6%)##r##
-                   ##r##
-        3/56 (5.4%)##r##
-                   ##r##
-        4/56 (7.1%)
+        2/47 (4.3%)\r
+                   \r
+        3/47 (6.4%)\r
+                   \r
+        4/47 (8.5%)
     <BLANKLINE>
     Error in test test3 (sample2.sampletests_e.Test)
     Traceback (most recent call last):
@@ -248,11 +247,11 @@
        - __traceback_info__: I don't know what Y should be.
     NameError: global name 'y' is not defined
     <BLANKLINE>
-        5/56 (8.9%)##r##
-                   ##r##
-        6/56 (10.7%)##r##
-                    ##r##
-        7/56 (12.5%)
+        5/47 (10.6%)\r
+                   \r
+        6/47 (12.8%)\r
+                    \r
+        7/47 (14.9%)
     <BLANKLINE>
     Failure in test testrunner-ex/sample2/e.txt
     Failed doctest test for e.txt
@@ -264,15 +263,15 @@
         f()
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest e.txt[line 4, example 1]>", line 1, in ?
+          File "<doctest e.txt[1]>", line 1, in ?
             f()
-          File "<doctest e.txt[line 1, example 0]>", line 2, in f
+          File "<doctest e.txt[0]>", line 2, in f
             return x
         NameError: global name 'x' is not defined
     <BLANKLINE>
-        8/56 (14.3%)
+        8/47 (17.0%)
     <BLANKLINE>
     Failure in test test (sample2.sampletests_f.Test)
     Traceback (most recent call last):
@@ -282,85 +281,86 @@
         raise self.failureException, \
     AssertionError: 1 != 0
     <BLANKLINE>
-        9/56 (16.1%)##r##
-                    ##r##
-        10/56 (17.9%)##r##
-                     ##r##
-        11/56 (19.6%)##r##
-                     ##r##
-        12/56 (21.4%)##r##
-                     ##r##
-        13/56 (23.2%)##r##
-                     ##r##
-        14/56 (25.0%)##r##
-                     ##r##
-        15/56 (26.8%)##r##
-                     ##r##
-        16/56 (28.6%)##r##
-                     ##r##
-        17/56 (30.4%)##r##
-                     ##r##
-        18/56 (32.1%)##r##
-                     ##r##
-        19/56 (33.9%)##r##
-                     ##r##
-        20/56 (35.7%)##r##
-                     ##r##
-        24/56 (42.9%)##r##
-                     ##r##
-        25/56 (44.6%)##r##
-                     ##r##
-        26/56 (46.4%)##r##
-                     ##r##
-        27/56 (48.2%)##r##
-                     ##r##
-        28/56 (50.0%)##r##
-                     ##r##
-        29/56 (51.8%)##r##
-                     ##r##
-        30/56 (53.6%)##r##
-                     ##r##
-        31/56 (55.4%)##r##
-                     ##r##
-        32/56 (57.1%)##r##
-                     ##r##
-        33/56 (58.9%)##r##
-                     ##r##
-        34/56 (60.7%)##r##
-                     ##r##
-        35/56 (62.5%)##r##
-                     ##r##
-        36/56 (64.3%)##r##
-                     ##r##
-        40/56 (71.4%)##r##
-                     ##r##
-        41/56 (73.2%)##r##
-                     ##r##
-        42/56 (75.0%)##r##
-                     ##r##
-        43/56 (76.8%)##r##
-                     ##r##
-        44/56 (78.6%)##r##
-                     ##r##
-        45/56 (80.4%)##r##
-                     ##r##
-        46/56 (82.1%)##r##
-                     ##r##
-        47/56 (83.9%)##r##
-                     ##r##
-        48/56 (85.7%)##r##
-                     ##r##
-        49/56 (87.5%)##r##
-                     ##r##
-        50/56 (89.3%)##r##
-                     ##r##
-        51/56 (91.1%)##r##
-                     ##r##
-        52/56 (92.9%)##r##
-                     ##r##
-        56/56 (100.0%)##r##
-                      ##r##
-      Ran 56 tests with 3 failures and 1 errors in 0.054 seconds.
+        9/47 (19.1%)\r
+                    \r
+        10/47 (21.3%)\r
+                     \r
+        11/47 (23.4%)\r
+                     \r
+        12/47 (25.5%)\r
+                     \r
+        13/47 (27.7%)\r
+                     \r
+        14/47 (29.8%)\r
+                     \r
+        15/47 (31.9%)\r
+                     \r
+        16/47 (34.0%)\r
+                     \r
+        17/47 (36.2%)\r
+                     \r
+        18/47 (38.3%)\r
+                     \r
+        19/47 (40.4%)\r
+                     \r
+        20/47 (42.6%)\r
+                     \r
+        21/47 (44.7%)\r
+                     \r
+        22/47 (46.8%)\r
+                     \r
+        23/47 (48.9%)\r
+                     \r
+        24/47 (51.1%)\r
+                     \r
+        25/47 (53.2%)\r
+                     \r
+        26/47 (55.3%)\r
+                     \r
+        27/47 (57.4%)\r
+                     \r
+        28/47 (59.6%)\r
+                     \r
+        29/47 (61.7%)\r
+                     \r
+        30/47 (63.8%)\r
+                     \r
+        31/47 (66.0%)\r
+                     \r
+        32/47 (68.1%)\r
+                     \r
+        33/47 (70.2%)\r
+                     \r
+        34/47 (72.3%)\r
+                     \r
+        35/47 (74.5%)\r
+                     \r
+        36/47 (76.6%)\r
+                     \r
+        37/47 (78.7%)\r
+                     \r
+        38/47 (80.9%)\r
+                     \r
+        39/47 (83.0%)\r
+                     \r
+        40/47 (85.1%)\r
+                     \r
+        41/47 (87.2%)\r
+                     \r
+        42/47 (89.4%)\r
+                     \r
+        43/47 (91.5%)\r
+                     \r
+        44/47 (93.6%)\r
+                     \r
+        45/47 (95.7%)\r
+                     \r
+        46/47 (97.9%)\r
+                     \r
+        47/47 (100.0%)\r
+                      \r
+    <BLANKLINE>
+      Ran 47 tests with 3 failures and 1 errors in 0.054 seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     True
@@ -392,9 +392,9 @@
         x = y
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_1.eek[line 2, example 0]>", line 1, in ?
+          File "<doctest sample2.sampletests_1.eek[0]>", line 1, in ?
             x = y
         NameError: name 'y' is not defined
     ----------------------------------------------------------------------
@@ -404,9 +404,9 @@
         x
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_1.eek[line 4, example 1]>", line 1, in ?
+          File "<doctest sample2.sampletests_1.eek[1]>", line 1, in ?
             x
         NameError: name 'x' is not defined
     ----------------------------------------------------------------------
@@ -416,9 +416,9 @@
         z = x + 1
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_1.eek[line 7, example 2]>", line 1, in ?
+          File "<doctest sample2.sampletests_1.eek[2]>", line 1, in ?
             z = x + 1
         NameError: name 'x' is not defined
     <BLANKLINE>
@@ -449,9 +449,9 @@
         x = y
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_1.eek[line 2, example 0]>", line 1, in ?
+          File "<doctest sample2.sampletests_1.eek[0]>", line 1, in ?
             x = y
         NameError: name 'y' is not defined
     <BLANKLINE>
@@ -476,15 +476,14 @@
       File "testrunner-ex/sample2/sampletests_1.py", line 17, in eek
     <BLANKLINE>
     ----------------------------------------------------------------------
-    File "testrunner-ex/sample2/sampletests_1.py", line 19,
-         in sample2.sampletests_1.eek
+    File "testrunner-ex/sample2/sampletests_1.py", line 19, in sample2.sampletests_1.eek
     Failed example:
         x = y
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_1.eek[line 2, example 0]>", line 1, in ?
+          File "<doctest sample2.sampletests_1.eek[0]>", line 1, in ?
             x = y
         NameError: name 'y' is not defined
     <BLANKLINE>
@@ -512,39 +511,36 @@
       File "testrunner-ex/sample2/sampletests_1.py", line 17, in eek
     <BLANKLINE>
     ----------------------------------------------------------------------
-    File "testrunner-ex/sample2/sampletests_1.py", line 19,
-         in sample2.sampletests_1.eek
+    File "testrunner-ex/sample2/sampletests_1.py", line 19, in sample2.sampletests_1.eek
     Failed example:
         x = y
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_1.eek[line 2, example 0]>", line 1, in ?
+          File "<doctest sample2.sampletests_1.eek[0]>", line 1, in ?
             x = y
         NameError: name 'y' is not defined
     ----------------------------------------------------------------------
-    File "testrunner-ex/sample2/sampletests_1.py", line 21,
-         in sample2.sampletests_1.eek
+    File "testrunner-ex/sample2/sampletests_1.py", line 21, in sample2.sampletests_1.eek
     Failed example:
         x
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_1.eek[line 4, example 1]>", line 1, in ?
+          File "<doctest sample2.sampletests_1.eek[1]>", line 1, in ?
             x
         NameError: name 'x' is not defined
     ----------------------------------------------------------------------
-    File "testrunner-ex/sample2/sampletests_1.py", line 24,
-         in sample2.sampletests_1.eek
+    File "testrunner-ex/sample2/sampletests_1.py", line 24, in sample2.sampletests_1.eek
     Failed example:
         z = x + 1
     Exception raised:
         Traceback (most recent call last):
-          File ".../doctest/__init__.py", line 1256, in __run
+          File ".../doctest.py", line 1256, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_1.eek[line 7, example 2]>", line 1, in ?
+          File "<doctest sample2.sampletests_1.eek[2]>", line 1, in ?
             z = x + 1
         NameError: name 'x' is not defined
     <BLANKLINE>
@@ -763,28 +759,28 @@
       Ran 9 tests with 0 failures and 0 errors in 0.000 seconds.
     Running samplelayers.Layer11 tests:
       Set up samplelayers.Layer11 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Running samplelayers.Layer111 tests:
       Set up samplelayers.Layerx in 0.000 seconds.
       Set up samplelayers.Layer111 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Running samplelayers.Layer112 tests:
       Tear down samplelayers.Layer111 in 0.000 seconds.
       Set up samplelayers.Layer112 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Running samplelayers.Layer12 tests:
       Tear down samplelayers.Layer112 in 0.000 seconds.
       Tear down samplelayers.Layerx in 0.000 seconds.
       Tear down samplelayers.Layer11 in 0.000 seconds.
       Set up samplelayers.Layer12 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Running samplelayers.Layer121 tests:
       Set up samplelayers.Layer121 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Running samplelayers.Layer122 tests:
       Tear down samplelayers.Layer121 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
-      Ran 34 tests with 0 failures and 0 errors in 0.006 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.006 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -794,7 +790,7 @@
       sample2.sampletests_i
       sample2.sample21.sampletests_i
       sample2.sample23.sampletests_i
-    Total: 213 tests, 0 failures, 0 errors in N.NNN seconds.
+    Total: 165 tests, 0 failures, 0 errors in N.NNN seconds.
     True
 
 
@@ -825,13 +821,21 @@
     ----------------------------------------------------------------------
     File testrunner-ex/unicode.txt", Line NNN, in unicode.txt
     Failed example:
+        print get_unicode()
+    Expected:
+        foo — bar
+    Got:
+        foo — bar
+    ----------------------------------------------------------------------
+    File testrunner-ex/unicode.txt", Line NNN, in unicode.txt
+    Failed example:
         'xyz'
     Expected:
         123
     Got:
         'xyz'
     <BLANKLINE>
-      Ran 3 tests with 1 failures and 0 errors in N.NNN seconds.
+      Ran 1 tests with 1 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     True
@@ -882,10 +886,10 @@
       Tear down samplelayers.Layer12 in N.NNN seconds.
       Tear down samplelayers.Layer1 in N.NNN seconds.
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
-      Ran 160 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 130 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
-    Total: 364 tests, 0 failures, 0 errors in N.NNN seconds.
+    Total: 286 tests, 0 failures, 0 errors in N.NNN seconds.
     exited with code 0
 
 And remove the temporary directory:

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-knit.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-knit.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-knit.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -57,7 +57,7 @@
         testrunner-ex/sampletests/../sampletestsl.txt
         test_extra_test_in_products (sample4.products.sampletests.Test)
         test_another_test_in_products (sample4.products.more.sampletests.Test)
-      Ran 36 tests with 0 failures and 0 errors in 0.008 seconds.
+      Ran 28 tests with 0 failures and 0 errors in 0.008 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer111 in 0.000 seconds.
       Tear down samplelayers.Layerx in 0.000 seconds.

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-ntd.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-ntd.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-ntd.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -214,7 +214,7 @@
     <BLANKLINE>
     --Return--
     > doctest.py(351)set_trace()->None
-    -> pdb.Pdb.set_trace(self)
+    -> Pdb().set_trace()
     (Pdb) c
     <BLANKLINE>
     **********************************************************************
@@ -223,7 +223,7 @@
     <BLANKLINE>
     --Return--
     > doctest.py(351)set_trace()->None
-    -> pdb.Pdb.set_trace(self)
+    -> Pdb().set_trace()
     (Pdb) c
     <BLANKLINE>
     **********************************************************************

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-layers.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-layers.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-layers.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -18,17 +18,17 @@
       Set up samplelayers.Layer1 in N.NNN seconds.
       Set up samplelayers.Layer11 in N.NNN seconds.
       Set up samplelayers.Layer112 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running zope.testrunner.layer.UnitTests tests:
       Tear down samplelayers.Layer112 in N.NNN seconds.
       Tear down samplelayers.Layerx in N.NNN seconds.
       Tear down samplelayers.Layer11 in N.NNN seconds.
       Tear down samplelayers.Layer1 in N.NNN seconds.
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
-    Total: 226 tests, 0 failures, 0 errors in N.NNN seconds.
+    Total: 182 tests, 0 failures, 0 errors in N.NNN seconds.
     False
 
 
@@ -38,7 +38,7 @@
     >>> testrunner.run_internal(defaults)
     Running zope.testrunner.layer.UnitTests tests:
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
@@ -53,33 +53,33 @@
       Ran 9 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer11 tests:
       Set up samplelayers.Layer11 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer111 tests:
       Set up samplelayers.Layerx in N.NNN seconds.
       Set up samplelayers.Layer111 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer112 tests:
       Tear down samplelayers.Layer111 in N.NNN seconds.
       Set up samplelayers.Layer112 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer12 tests:
       Tear down samplelayers.Layer112 in N.NNN seconds.
       Tear down samplelayers.Layerx in N.NNN seconds.
       Tear down samplelayers.Layer11 in N.NNN seconds.
       Set up samplelayers.Layer12 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer121 tests:
       Set up samplelayers.Layer121 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer122 tests:
       Tear down samplelayers.Layer121 in N.NNN seconds.
       Set up samplelayers.Layer122 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in N.NNN seconds.
       Tear down samplelayers.Layer12 in N.NNN seconds.
       Tear down samplelayers.Layer1 in N.NNN seconds.
-    Total: 213 tests, 0 failures, 0 errors in N.NNN seconds.
+    Total: 165 tests, 0 failures, 0 errors in N.NNN seconds.
     False
 
 Or we can explicitly say that we want both unit and non-unit tests.
@@ -91,37 +91,37 @@
       Ran 9 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer11 tests:
       Set up samplelayers.Layer11 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer111 tests:
       Set up samplelayers.Layerx in N.NNN seconds.
       Set up samplelayers.Layer111 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer112 tests:
       Tear down samplelayers.Layer111 in N.NNN seconds.
       Set up samplelayers.Layer112 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer12 tests:
       Tear down samplelayers.Layer112 in N.NNN seconds.
       Tear down samplelayers.Layerx in N.NNN seconds.
       Tear down samplelayers.Layer11 in N.NNN seconds.
       Set up samplelayers.Layer12 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer121 tests:
       Set up samplelayers.Layer121 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer122 tests:
       Tear down samplelayers.Layer121 in N.NNN seconds.
       Set up samplelayers.Layer122 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running zope.testrunner.layer.UnitTests tests:
       Tear down samplelayers.Layer122 in N.NNN seconds.
       Tear down samplelayers.Layer12 in N.NNN seconds.
       Tear down samplelayers.Layer1 in N.NNN seconds.
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
-    Total: 405 tests, 0 failures, 0 errors in N.NNN seconds.
+    Total: 321 tests, 0 failures, 0 errors in N.NNN seconds.
     False
 
 It is possible to force the layers to run in subprocesses and parallelize them.
@@ -135,41 +135,41 @@
       Running in a subprocess.
       Set up samplelayers.Layer1 in N.NNN seconds.
       Set up samplelayers.Layer11 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer111 tests:
       Running in a subprocess.
       Set up samplelayers.Layerx in N.NNN seconds.
       Set up samplelayers.Layer1 in N.NNN seconds.
       Set up samplelayers.Layer11 in N.NNN seconds.
       Set up samplelayers.Layer111 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer112 tests:
       Running in a subprocess.
       Set up samplelayers.Layerx in N.NNN seconds.
       Set up samplelayers.Layer1 in N.NNN seconds.
       Set up samplelayers.Layer11 in N.NNN seconds.
       Set up samplelayers.Layer112 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer12 tests:
       Running in a subprocess.
       Set up samplelayers.Layer1 in N.NNN seconds.
       Set up samplelayers.Layer12 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer121 tests:
       Running in a subprocess.
       Set up samplelayers.Layer1 in N.NNN seconds.
       Set up samplelayers.Layer12 in N.NNN seconds.
       Set up samplelayers.Layer121 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer122 tests:
       Running in a subprocess.
       Set up samplelayers.Layer1 in N.NNN seconds.
       Set up samplelayers.Layer12 in N.NNN seconds.
       Set up samplelayers.Layer122 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running zope.testrunner.layer.UnitTests tests:
       Running in a subprocess.
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
-    Total: 405 tests, 0 failures, 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
+    Total: 321 tests, 0 failures, 0 errors in N.NNN seconds.
     False

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -21,29 +21,29 @@
       Set up samplelayers.Layer1 in 0.000 seconds.
       Set up samplelayers.Layer11 in 0.000 seconds.
     Iteration 1
-      Ran 34 tests with 0 failures and 0 errors in 0.013 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.013 seconds.
     Iteration 2
-      Ran 34 tests with 0 failures and 0 errors in 0.012 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.012 seconds.
       sys refcount=100401   change=0     
     Iteration 3
-      Ran 34 tests with 0 failures and 0 errors in 0.012 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.012 seconds.
       sys refcount=100401   change=0     
     Iteration 4
-      Ran 34 tests with 0 failures and 0 errors in 0.013 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.013 seconds.
       sys refcount=100401   change=0     
     Running samplelayers.Layer12 tests:
       Tear down samplelayers.Layer11 in 0.000 seconds.
       Set up samplelayers.Layer12 in 0.000 seconds.
     Iteration 1
-      Ran 34 tests with 0 failures and 0 errors in 0.013 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.013 seconds.
     Iteration 2
-      Ran 34 tests with 0 failures and 0 errors in 0.012 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.012 seconds.
       sys refcount=100411   change=0     
     Iteration 3
-      Ran 34 tests with 0 failures and 0 errors in 0.012 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.012 seconds.
       sys refcount=100411   change=0     
     Iteration 4
-      Ran 34 tests with 0 failures and 0 errors in 0.012 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.012 seconds.
       sys refcount=100411   change=0     
     Tearing down left over layers:
       Tear down samplelayers.Layer12 in 0.000 seconds.

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -17,69 +17,71 @@
     >>> from zope import testrunner
     >>> testrunner.run_internal(defaults)
     Running samplelayers.Layer122 tests:
-      Set up samplelayers.Layer1 in 0.000 seconds.
-      Set up samplelayers.Layer12 in 0.000 seconds.
-      Set up samplelayers.Layer122 in 0.000 seconds.
+      Set up samplelayers.Layer1 in N.NNN seconds.
+      Set up samplelayers.Layer12 in N.NNN seconds.
+      Set up samplelayers.Layer122 in N.NNN seconds.
       Running:
-        1/34 (2.9%)##r##
+        1/26 (3.8%)##r##
                    ##r##
-        2/34 (5.9%)##r##
+        2/26 (7.7%)##r##
                    ##r##
-        3/34 (8.8%)##r##
-                   ##r##
-        4/34 (11.8%)##r##
+        3/26 (11.5%)##r##
                     ##r##
-        5/34 (14.7%)##r##
+        4/26 (15.4%)##r##
                     ##r##
-        6/34 (17.6%)##r##
+        5/26 (19.2%)##r##
                     ##r##
-        7/34 (20.6%)##r##
+        6/26 (23.1%)##r##
                     ##r##
-        8/34 (23.5%)##r##
+        7/26 (26.9%)##r##
                     ##r##
-        9/34 (26.5%)##r##
+        8/26 (30.8%)##r##
                     ##r##
-        10/34 (29.4%)##r##
+        9/26 (34.6%)##r##
+                    ##r##
+        10/26 (38.5%)##r##
                      ##r##
-        11/34 (32.4%)##r##
+        11/26 (42.3%)##r##
                      ##r##
-        12/34 (35.3%)##r##
+        12/26 (46.2%)##r##
                      ##r##
-        17/34 (50.0%)##r##
+        13/26 (50.0%)##r##
                      ##r##
-        18/34 (52.9%)##r##
+        14/26 (53.8%)##r##
                      ##r##
-        19/34 (55.9%)##r##
+        15/26 (57.7%)##r##
                      ##r##
-        20/34 (58.8%)##r##
+        16/26 (61.5%)##r##
                      ##r##
-        21/34 (61.8%)##r##
+        17/26 (65.4%)##r##
                      ##r##
-        22/34 (64.7%)##r##
+        18/26 (69.2%)##r##
                      ##r##
-        23/34 (67.6%)##r##
+        19/26 (73.1%)##r##
                      ##r##
-        24/34 (70.6%)##r##
+        20/26 (76.9%)##r##
                      ##r##
-        25/34 (73.5%)##r##
+        21/26 (80.8%)##r##
                      ##r##
-        26/34 (76.5%)##r##
+        22/26 (84.6%)##r##
                      ##r##
-        27/34 (79.4%)##r##
+        23/26 (88.5%)##r##
                      ##r##
-        28/34 (82.4%)##r##
+        24/26 (92.3%)##r##
                      ##r##
-        29/34 (85.3%)##r##
+        25/26 (96.2%)##r##
                      ##r##
-        34/34 (100.0%)##r##
+        26/26 (100.0%)##r##
                       ##r##
-      Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
+    <BLANKLINE>
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
-      Tear down samplelayers.Layer122 in 0.000 seconds.
-      Tear down samplelayers.Layer12 in 0.000 seconds.
-      Tear down samplelayers.Layer1 in 0.000 seconds.
+      Tear down samplelayers.Layer122 in N.NNN seconds.
+      Tear down samplelayers.Layer12 in N.NNN seconds.
+      Tear down samplelayers.Layer1 in N.NNN seconds.
     False
 
+
 (Note that, in the examples above and below, we show "##r##" followed by
 new lines where carriage returns would appear in actual output.)
 
@@ -87,73 +89,75 @@
 output, but only if they fit in the terminal width.  The default
 width, when the terminal width can't be determined, is 80:
 
->>> sys.argv = 'test --layer 122 -pv'.split()
->>> testrunner.run_internal(defaults)
-Running tests at level 1
-Running samplelayers.Layer122 tests:
-  Set up samplelayers.Layer1 in 0.000 seconds.
-  Set up samplelayers.Layer12 in 0.000 seconds.
-  Set up samplelayers.Layer122 in 0.000 seconds.
-  Running:
-    1/34 (2.9%) test_x1 (sample1.sampletests.test122.TestA)##r##
+    >>> sys.argv = 'test --layer 122 -pv'.split()
+    >>> testrunner.run_internal(defaults)
+    Running tests at level 1
+    Running samplelayers.Layer122 tests:
+      Set up samplelayers.Layer1 in N.NNN seconds.
+      Set up samplelayers.Layer12 in N.NNN seconds.
+      Set up samplelayers.Layer122 in N.NNN seconds.
+      Running:
+        1/26 (3.8%) test_x1 (sample1.sampletests.test122.TestA)##r##
+                                                               ##r##
+        2/26 (7.7%) test_y0 (sample1.sampletests.test122.TestA)##r##
+                                                               ##r##
+        3/26 (11.5%) test_z0 (sample1.sampletests.test122.TestA)##r##
+                                                                ##r##
+        4/26 (15.4%) test_x0 (sample1.sampletests.test122.TestB)##r##
+                                                                ##r##
+        5/26 (19.2%) test_y1 (sample1.sampletests.test122.TestB)##r##
+                                                                ##r##
+        6/26 (23.1%) test_z0 (sample1.sampletests.test122.TestB)##r##
+                                                                ##r##
+        7/26 (26.9%) test_1 (sample1.sampletests.test122.TestNotMuch)##r##
+                                                                     ##r##
+        8/26 (30.8%) test_2 (sample1.sampletests.test122.TestNotMuch)##r##
+                                                                     ##r##
+        9/26 (34.6%) test_3 (sample1.sampletests.test122.TestNotMuch)##r##
+                                                                     ##r##
+        10/26 (38.5%) test_x0 (sample1.sampletests.test122)##r##
                                                            ##r##
-    2/34 (5.9%) test_y0 (sample1.sampletests.test122.TestA)##r##
+        11/26 (42.3%) test_y0 (sample1.sampletests.test122)##r##
                                                            ##r##
-    3/34 (8.8%) test_z0 (sample1.sampletests.test122.TestA)##r##
+        12/26 (46.2%) test_z1 (sample1.sampletests.test122)##r##
                                                            ##r##
-    4/34 (11.8%) test_x0 (sample1.sampletests.test122.TestB)##r##
-                                                            ##r##
-    5/34 (14.7%) test_y1 (sample1.sampletests.test122.TestB)##r##
-                                                            ##r##
-    6/34 (17.6%) test_z0 (sample1.sampletests.test122.TestB)##r##
-                                                            ##r##
-    7/34 (20.6%) test_1 (sample1.sampletests.test122.TestNotMuch)##r##
-                                                                 ##r##
-    8/34 (23.5%) test_2 (sample1.sampletests.test122.TestNotMuch)##r##
-                                                                 ##r##
-    9/34 (26.5%) test_3 (sample1.sampletests.test122.TestNotMuch)##r##
-                                                                 ##r##
-    10/34 (29.4%) test_x0 (sample1.sampletests.test122)##r##
-                                                       ##r##
-    11/34 (32.4%) test_y0 (sample1.sampletests.test122)##r##
-                                                       ##r##
-    12/34 (35.3%) test_z1 (sample1.sampletests.test122)##r##
-                                                       ##r##
-    17/34 (50.0%) ... /testrunner-ex/sample1/sampletests/../../sampletestsl.txt##r##
-                                                                               ##r##
-    18/34 (52.9%) test_x1 (sampletests.test122.TestA)##r##
-                                                     ##r##
-    19/34 (55.9%) test_y0 (sampletests.test122.TestA)##r##
-                                                     ##r##
-    20/34 (58.8%) test_z0 (sampletests.test122.TestA)##r##
-                                                     ##r##
-    21/34 (61.8%) test_x0 (sampletests.test122.TestB)##r##
-                                                     ##r##
-    22/34 (64.7%) test_y1 (sampletests.test122.TestB)##r##
-                                                     ##r##
-    23/34 (67.6%) test_z0 (sampletests.test122.TestB)##r##
-                                                     ##r##
-    24/34 (70.6%) test_1 (sampletests.test122.TestNotMuch)##r##
-                                                          ##r##
-    25/34 (73.5%) test_2 (sampletests.test122.TestNotMuch)##r##
-                                                          ##r##
-    26/34 (76.5%) test_3 (sampletests.test122.TestNotMuch)##r##
-                                                          ##r##
-    27/34 (79.4%) test_x0 (sampletests.test122)##r##
-                                               ##r##
-    28/34 (82.4%) test_y0 (sampletests.test122)##r##
-                                               ##r##
-    29/34 (85.3%) test_z1 (sampletests.test122)##r##
-                                               ##r##
-    34/34 (100.0%) ... pe/testing/testrunner-ex/sampletests/../sampletestsl.txt##r##
-                                                                               ##r##
-  Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
-Tearing down left over layers:
-  Tear down samplelayers.Layer122 in 0.000 seconds.
-  Tear down samplelayers.Layer12 in 0.000 seconds.
-  Tear down samplelayers.Layer1 in 0.000 seconds.
-False
+     testrunner-ex/sample1/sampletests/../../sampletestsl.txt##r##
+                                                                                   ##r##
+        14/26 (53.8%) test_x1 (sampletests.test122.TestA)##r##
+                                                         ##r##
+        15/26 (57.7%) test_y0 (sampletests.test122.TestA)##r##
+                                                         ##r##
+        16/26 (61.5%) test_z0 (sampletests.test122.TestA)##r##
+                                                         ##r##
+        17/26 (65.4%) test_x0 (sampletests.test122.TestB)##r##
+                                                         ##r##
+        18/26 (69.2%) test_y1 (sampletests.test122.TestB)##r##
+                                                         ##r##
+        19/26 (73.1%) test_z0 (sampletests.test122.TestB)##r##
+                                                         ##r##
+        20/26 (76.9%) test_1 (sampletests.test122.TestNotMuch)##r##
+                                                              ##r##
+        21/26 (80.8%) test_2 (sampletests.test122.TestNotMuch)##r##
+                                                              ##r##
+        22/26 (84.6%) test_3 (sampletests.test122.TestNotMuch)##r##
+                                                              ##r##
+        23/26 (88.5%) test_x0 (sampletests.test122)##r##
+                                                   ##r##
+        24/26 (92.3%) test_y0 (sampletests.test122)##r##
+                                                   ##r##
+        25/26 (96.2%) test_z1 (sampletests.test122)##r##
+                                                   ##r##
+     testrunner-ex/sampletests/../sampletestsl.txt##r##
+                                                                                   ##r##
+    <BLANKLINE>
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
+    Tearing down left over layers:
+      Tear down samplelayers.Layer122 in N.NNN seconds.
+      Tear down samplelayers.Layer12 in N.NNN seconds.
+      Tear down samplelayers.Layer1 in N.NNN seconds.
+    False
 
+
 The terminal width is determined using the curses module.  To see
 that, we'll provide a fake curses module:
 
@@ -167,67 +171,68 @@
     >>> testrunner.run_internal(defaults)
     Running tests at level 1
     Running samplelayers.Layer122 tests:
-      Set up samplelayers.Layer1 in 0.000 seconds.
-      Set up samplelayers.Layer12 in 0.000 seconds.
-      Set up samplelayers.Layer122 in 0.000 seconds.
+      Set up samplelayers.Layer1 in N.NNN seconds.
+      Set up samplelayers.Layer12 in N.NNN seconds.
+      Set up samplelayers.Layer122 in N.NNN seconds.
       Running:
-        1/34 (2.9%) test_x1 (sample1.sampletests.test122.TestA)##r##
+        1/26 (3.8%) test_x1 (sample1.sampletests.test122.TestA)##r##
                                                                ##r##
-        2/34 (5.9%) test_y0 (sample1.sampletests.test122.TestA)##r##
+        2/26 (7.7%) test_y0 (sample1.sampletests.test122.TestA)##r##
                                                                ##r##
-        3/34 (8.8%) test_z0 (sample1.sampletests.test122.TestA)##r##
+        3/26 (11.5%) test_z0 (...le1.sampletests.test122.TestA)##r##
                                                                ##r##
-        4/34 (11.8%) test_x0 (...le1.sampletests.test122.TestB)##r##
+        4/26 (15.4%) test_x0 (...le1.sampletests.test122.TestB)##r##
                                                                ##r##
-        5/34 (14.7%) test_y1 (...le1.sampletests.test122.TestB)##r##
+        5/26 (19.2%) test_y1 (...le1.sampletests.test122.TestB)##r##
                                                                ##r##
-        6/34 (17.6%) test_z0 (...le1.sampletests.test122.TestB)##r##
+        6/26 (23.1%) test_z0 (...le1.sampletests.test122.TestB)##r##
                                                                ##r##
-        7/34 (20.6%) test_1 (...ampletests.test122.TestNotMuch)##r##
+        7/26 (26.9%) test_1 (...ampletests.test122.TestNotMuch)##r##
                                                                ##r##
-        8/34 (23.5%) test_2 (...ampletests.test122.TestNotMuch)##r##
+        8/26 (30.8%) test_2 (...ampletests.test122.TestNotMuch)##r##
                                                                ##r##
-        9/34 (26.5%) test_3 (...ampletests.test122.TestNotMuch)##r##
+        9/26 (34.6%) test_3 (...ampletests.test122.TestNotMuch)##r##
                                                                ##r##
-        10/34 (29.4%) test_x0 (sample1.sampletests.test122)##r##
+        10/26 (38.5%) test_x0 (sample1.sampletests.test122)##r##
                                                            ##r##
-        11/34 (32.4%) test_y0 (sample1.sampletests.test122)##r##
+        11/26 (42.3%) test_y0 (sample1.sampletests.test122)##r##
                                                            ##r##
-        12/34 (35.3%) test_z1 (sample1.sampletests.test122)##r##
+        12/26 (46.2%) test_z1 (sample1.sampletests.test122)##r##
                                                            ##r##
-        17/34 (50.0%) ... e1/sampletests/../../sampletestsl.txt##r##
+        13/26 (50.0%) ... e1/sampletests/../../sampletestsl.txt##r##
                                                                ##r##
-        18/34 (52.9%) test_x1 (sampletests.test122.TestA)##r##
+        14/26 (53.8%) test_x1 (sampletests.test122.TestA)##r##
                                                          ##r##
-        19/34 (55.9%) test_y0 (sampletests.test122.TestA)##r##
+        15/26 (57.7%) test_y0 (sampletests.test122.TestA)##r##
                                                          ##r##
-        20/34 (58.8%) test_z0 (sampletests.test122.TestA)##r##
+        16/26 (61.5%) test_z0 (sampletests.test122.TestA)##r##
                                                          ##r##
-        21/34 (61.8%) test_x0 (sampletests.test122.TestB)##r##
+        17/26 (65.4%) test_x0 (sampletests.test122.TestB)##r##
                                                          ##r##
-        22/34 (64.7%) test_y1 (sampletests.test122.TestB)##r##
+        18/26 (69.2%) test_y1 (sampletests.test122.TestB)##r##
                                                          ##r##
-        23/34 (67.6%) test_z0 (sampletests.test122.TestB)##r##
+        19/26 (73.1%) test_z0 (sampletests.test122.TestB)##r##
                                                          ##r##
-        24/34 (70.6%) test_1 (sampletests.test122.TestNotMuch)##r##
+        20/26 (76.9%) test_1 (sampletests.test122.TestNotMuch)##r##
                                                               ##r##
-        25/34 (73.5%) test_2 (sampletests.test122.TestNotMuch)##r##
+        21/26 (80.8%) test_2 (sampletests.test122.TestNotMuch)##r##
                                                               ##r##
-        26/34 (76.5%) test_3 (sampletests.test122.TestNotMuch)##r##
+        22/26 (84.6%) test_3 (sampletests.test122.TestNotMuch)##r##
                                                               ##r##
-        27/34 (79.4%) test_x0 (sampletests.test122)##r##
+        23/26 (88.5%) test_x0 (sampletests.test122)##r##
                                                    ##r##
-        28/34 (82.4%) test_y0 (sampletests.test122)##r##
+        24/26 (92.3%) test_y0 (sampletests.test122)##r##
                                                    ##r##
-        29/34 (85.3%) test_z1 (sampletests.test122)##r##
+        25/26 (96.2%) test_z1 (sampletests.test122)##r##
                                                    ##r##
-        34/34 (100.0%) ... r-ex/sampletests/../sampletestsl.txt##r##
+        26/26 (100.0%) ... r-ex/sampletests/../sampletestsl.txt##r##
                                                                ##r##
-      Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
+    <BLANKLINE>
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
-      Tear down samplelayers.Layer122 in 0.000 seconds.
-      Tear down samplelayers.Layer12 in 0.000 seconds.
-      Tear down samplelayers.Layer1 in 0.000 seconds.
+      Tear down samplelayers.Layer122 in N.NNN seconds.
+      Tear down samplelayers.Layer12 in N.NNN seconds.
+      Tear down samplelayers.Layer1 in N.NNN seconds.
     False
 
     >>> sys.modules['curses'] = old_curses

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-repeat.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-repeat.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-repeat.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -21,11 +21,11 @@
       Set up samplelayers.Layer11 in 0.000 seconds.
       Set up samplelayers.Layer112 in 0.000 seconds.
     Iteration 1
-      Ran 34 tests with 0 failures and 0 errors in 0.010 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.010 seconds.
     Iteration 2
-      Ran 34 tests with 0 failures and 0 errors in 0.010 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.010 seconds.
     Iteration 3
-      Ran 34 tests with 0 failures and 0 errors in 0.010 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.010 seconds.
     Running zope.testrunner.layer.UnitTests tests:
       Tear down samplelayers.Layer112 in N.NNN seconds.
       Tear down samplelayers.Layerx in N.NNN seconds.
@@ -33,14 +33,14 @@
       Tear down samplelayers.Layer1 in N.NNN seconds.
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
     Iteration 1
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
     Iteration 2
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
     Iteration 3
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
-    Total: 226 tests, 0 failures, 0 errors in N.NNN seconds.
+    Total: 182 tests, 0 failures, 0 errors in N.NNN seconds.
     False
 
 The tests are repeated by layer.  Layers are set up and torn down only

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-shuffle.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-shuffle.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-shuffle.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -53,30 +53,30 @@
     >>> testrunner.run_internal(defaults, argv)
     Tests were shuffled using seed number 0.
     Listing zope.testrunner.layer.UnitTests tests:
-      test_y0 (sample1.sample13.sampletests.TestA)
       test_y0 (sample1.sampletestsf.TestA)
+      test_y0 (sample1.sampletests.test_one)
+      test_y0 (sample1.sampletests.test1.TestA)
       test_y0 (sample1.sampletestsf)
       test_y0 (sample1.sampletests.test_one.TestA)
-      test_y0 (sample1.sampletests.test_one)
+      test_y0 (sample1.sample13.sampletests)
+      test_y0 (sample1.sample13.sampletests.TestA)
+      test_y0 (sample1.sample11.sampletests)
+      test_y0 (sample1.sample11.sampletests.TestA)
       test_y0 (sample1.sampletests.test1)
-      test_y0 (sample1.sample11.sampletests.TestA)
-      test_y0 (sample1.sampletests.test1.TestA)
-      test_y0 (sample1.sample11.sampletests)
-      test_y0 (sample1.sample13.sampletests)
     False
     >>> testrunner.run_internal(defaults, argv)
     Tests were shuffled using seed number 0.
     Listing zope.testrunner.layer.UnitTests tests:
-      test_y0 (sample1.sample13.sampletests.TestA)
       test_y0 (sample1.sampletestsf.TestA)
+      test_y0 (sample1.sampletests.test_one)
+      test_y0 (sample1.sampletests.test1.TestA)
       test_y0 (sample1.sampletestsf)
       test_y0 (sample1.sampletests.test_one.TestA)
-      test_y0 (sample1.sampletests.test_one)
+      test_y0 (sample1.sample13.sampletests)
+      test_y0 (sample1.sample13.sampletests.TestA)
+      test_y0 (sample1.sample11.sampletests)
+      test_y0 (sample1.sample11.sampletests.TestA)
       test_y0 (sample1.sampletests.test1)
-      test_y0 (sample1.sample11.sampletests.TestA)
-      test_y0 (sample1.sampletests.test1.TestA)
-      test_y0 (sample1.sample11.sampletests)
-      test_y0 (sample1.sample13.sampletests)
     False
 
 Whereas using the seed number 42 will give us the following, different but
@@ -86,30 +86,30 @@
     >>> testrunner.run_internal(defaults, argv)
     Tests were shuffled using seed number 42.
     Listing zope.testrunner.layer.UnitTests tests:
+      test_y0 (sample1.sample13.sampletests.TestA)
       test_y0 (sample1.sample13.sampletests)
+      test_y0 (sample1.sampletests.test1)
+      test_y0 (sample1.sampletests.test1.TestA)
+      test_y0 (sample1.sample11.sampletests.TestA)
+      test_y0 (sample1.sampletestsf)
+      test_y0 (sample1.sampletests.test_one)
       test_y0 (sample1.sample11.sampletests)
-      test_y0 (sample1.sampletestsf)
-      test_y0 (sample1.sample13.sampletests.TestA)
+      test_y0 (sample1.sampletestsf.TestA)
       test_y0 (sample1.sampletests.test_one.TestA)
-      test_y0 (sample1.sample11.sampletests.TestA)
-      test_y0 (sample1.sampletestsf.TestA)
-      test_y0 (sample1.sampletests.test_one)
-      test_y0 (sample1.sampletests.test1.TestA)
-      test_y0 (sample1.sampletests.test1)
     False
     >>> testrunner.run_internal(defaults, argv)
     Tests were shuffled using seed number 42.
     Listing zope.testrunner.layer.UnitTests tests:
+      test_y0 (sample1.sample13.sampletests.TestA)
       test_y0 (sample1.sample13.sampletests)
+      test_y0 (sample1.sampletests.test1)
+      test_y0 (sample1.sampletests.test1.TestA)
+      test_y0 (sample1.sample11.sampletests.TestA)
+      test_y0 (sample1.sampletestsf)
+      test_y0 (sample1.sampletests.test_one)
       test_y0 (sample1.sample11.sampletests)
-      test_y0 (sample1.sampletestsf)
-      test_y0 (sample1.sample13.sampletests.TestA)
+      test_y0 (sample1.sampletestsf.TestA)
       test_y0 (sample1.sampletests.test_one.TestA)
-      test_y0 (sample1.sample11.sampletests.TestA)
-      test_y0 (sample1.sampletestsf.TestA)
-      test_y0 (sample1.sampletests.test_one)
-      test_y0 (sample1.sampletests.test1.TestA)
-      test_y0 (sample1.sampletests.test1)
     False
 
 Selecting a seed number without ``--shuffle``

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-simple.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-simple.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-simple.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -52,37 +52,37 @@
       Ran 9 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer11 tests:
       Set up samplelayers.Layer11 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer111 tests:
       Set up samplelayers.Layerx in N.NNN seconds.
       Set up samplelayers.Layer111 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer112 tests:
       Tear down samplelayers.Layer111 in N.NNN seconds.
       Set up samplelayers.Layer112 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer12 tests:
       Tear down samplelayers.Layer112 in N.NNN seconds.
       Tear down samplelayers.Layerx in N.NNN seconds.
       Tear down samplelayers.Layer11 in N.NNN seconds.
       Set up samplelayers.Layer12 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer121 tests:
       Set up samplelayers.Layer121 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running samplelayers.Layer122 tests:
       Tear down samplelayers.Layer121 in N.NNN seconds.
       Set up samplelayers.Layer122 in N.NNN seconds.
-      Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Running zope.testrunner.layer.UnitTests tests:
       Tear down samplelayers.Layer122 in N.NNN seconds.
       Tear down samplelayers.Layer12 in N.NNN seconds.
       Tear down samplelayers.Layer1 in N.NNN seconds.
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
-      Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 156 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
-    Total: 405 tests, 0 failures, 0 errors in N.NNN seconds.
+    Total: 321 tests, 0 failures, 0 errors in N.NNN seconds.
     False
 
 we see the normal testrunner output, which summarizes the tests run for

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -246,7 +246,7 @@
         Traceback (most recent call last):
           File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/doctest/__init__.py", line 1355, in __run
             compileflags, 1) in test.globs
-          File "<doctest sample2.sampletests_e.eek[line 2, example 0]>", line 1, in <module>
+          File "<doctest sample2.sampletests_e.eek[0]>", line 1, in <module>
             f()
           File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 19, in f
             g()
@@ -303,9 +303,9 @@
         Traceback (most recent call last):
           File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/doctest/__init__.py", line 1355, in __run
             compileflags, 1) in test.globs
-          File "<doctest e.txt[line 4, example 1]>", line 1, in <module>
+          File "<doctest e.txt[1]>", line 1, in <module>
             f()
-          File "<doctest e.txt[line 1, example 0]>", line 2, in f
+          File "<doctest e.txt[0]>", line 2, in f
             return x
         NameError: global name 'x' is not defined
     0\r

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-test-selection.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-test-selection.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-test-selection.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -33,7 +33,7 @@
         test_y0 (sample1.sampletests.test122)
         test_z1 (sample1.sampletests.test122)
         testrunner-ex/sample1/sampletests/../../sampletestsl.txt
-      Ran 17 tests with 0 failures and 0 errors in 0.005 seconds.
+      Ran 13 tests with 0 failures and 0 errors in 0.005 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -152,7 +152,7 @@
      test_y0 (sample2.sampletests.testone)
      test_z1 (sample2.sampletests.testone)
      testrunner-ex/sample2/sampletests/../../sampletests.txt
-      Ran 128 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 104 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
@@ -183,7 +183,7 @@
         test_y0 (sample1.sampletests.test122)
         test_z1 (sample1.sampletests.test122)
         testrunner-ex/sample1/sampletests/../../sampletestsl.txt
-      Ran 17 tests with 0 failures and 0 errors in 0.005 seconds.
+      Ran 13 tests with 0 failures and 0 errors in 0.005 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -224,7 +224,7 @@
      test_y0 (sample1.sampletests.test_one)
      test_z1 (sample1.sampletests.test_one)
      testrunner-ex/sample1/sampletests/../../sampletests.txt
-      Ran 32 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
@@ -263,7 +263,7 @@
      testrunner-ex/sample1/sample13/../../sampletests.txt
      testrunner-ex/sample1/sampletests/../../sampletests.txt
      testrunner-ex/sample1/sampletests/../../sampletests.txt
-      Ran 20 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 5 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
@@ -318,7 +318,7 @@
      test_y0 (sample1.sampletests.test_one)
      test_z1 (sample1.sampletests.test_one)
      testrunner-ex/sample1/sampletests/../../sampletests.txt
-      Ran 48 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 39 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
@@ -372,7 +372,7 @@
      test_y0 (sample1.sampletests.test_one)
      test_z1 (sample1.sampletests.test_one)
      testrunner-ex/sample1/sampletests/../../sampletests.txt
-      Ran 48 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 39 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
@@ -389,7 +389,7 @@
      testrunner-ex/sample1/sample13/../../sampletests.txt
      testrunner-ex/sample1/sampletests/../../sampletests.txt
      testrunner-ex/sample1/sampletests/../../sampletests.txt
-      Ran 20 tests with 0 failures and 0 errors in N.NNN seconds.
+      Ran 5 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-verbose.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-verbose.txt	2010-04-26 09:43:28 UTC (rev 111418)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-verbose.txt	2010-04-26 09:50:07 UTC (rev 111419)
@@ -23,7 +23,7 @@
       Set up samplelayers.Layer122 in 0.000 seconds.
       Running:
         ..................................
-      Ran 34 tests with 0 failures and 0 errors in 0.007 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.007 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -40,7 +40,7 @@
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
       Running:
     ................................................................................................................................................................................................
-      Ran 192 tests with 0 failures and 0 errors in 0.035 seconds.
+      Ran 156 tests with 0 failures and 0 errors in 0.035 seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False
@@ -82,7 +82,7 @@
         test_y0 (sampletests.test122)
         test_z1 (sampletests.test122)
         testrunner-ex/sampletests/../sampletestsl.txt
-      Ran 34 tests with 0 failures and 0 errors in 0.009 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.009 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -126,7 +126,7 @@
         test_y0 (sampletests.test122) (0.001 s)
         test_z1 (sampletests.test122) (0.001 s)
         testrunner-ex/sampletests/../sampletestsl.txt (0.001 s)
-      Ran 34 tests with 0 failures and 0 errors in 0.009 seconds.
+      Ran 26 tests with 0 failures and 0 errors in 0.009 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
       Tear down samplelayers.Layer12 in 0.000 seconds.
@@ -148,7 +148,7 @@
     >>> testrunner.run_internal(defaults)
     Running zope.testrunner.layer.UnitTests tests:
       Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
-      Ran 192 tests with 0 failures and 0 errors in 0.034 seconds.
+      Ran 156 tests with 0 failures and 0 errors in 0.034 seconds.
     Tearing down left over layers:
       Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
     False



More information about the checkins mailing list