[Zope3-checkins] SVN: zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/test More formatting errors gone.

[Lennart Regebro]

Log message for revision 106265:
  More formatting errors gone.
  

Changed:
  U   zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/testrunner-edge-cases.txt
  U   zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/tests.py

-=-
Modified: zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/testrunner-edge-cases.txt
===================================================================
--- zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/testrunner-edge-cases.txt	2009-12-07 23:42:20 UTC (rev 106264)
+++ zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/testrunner-edge-cases.txt	2009-12-08 07:06:25 UTC (rev 106265)
@@ -112,11 +112,11 @@
     >>> try: testrunner.run_internal(defaults)
     ... finally: sys.stdin = real_stdin
     Running zope.testing.testrunner.layer.UnitTests tests:...
+    > testrunner-ex/sample3/sampletests_d.py(NNN)f()
+    -> y = x
+    (Pdb) n
     --Return--
-    > doctest.py(351)set_trace()->None
-    -> Pdb().set_trace()
-    (Pdb) n
-    > testrunner-ex/sample3/sampletests_d.py(42)f()
+    > ...->None
     -> y = x
     (Pdb) p x
     1
@@ -133,19 +133,20 @@
     >>> try: testrunner.run_internal(defaults)
     ... finally: sys.stdin = real_stdin
     Running zope.testing.testrunner.layer.UnitTests tests:...
+    > <doctest sample3.sampletests_d.set_trace3[1]>(3)?()
+    -> y = x
+    (Pdb) n
     --Return--
-    > doctest.py(351)set_trace()->None
-    -> Pdb().set_trace()
-    (Pdb) n
-    > <doctest sample3.sampletests_d.set_trace3[line 3, example 1]>(3)...()
+    > ...->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.
     ...
     False
 
+
 Using pdb.set_trace in a doc file:
 
 
@@ -155,16 +156,16 @@
     >>> try: testrunner.run_internal(defaults)
     ... finally: sys.stdin = real_stdin
     Running zope.testing.testrunner.layer.UnitTests tests:...
+    > <doctest set_trace5.txt[1]>(3)?()
+    -> y = x
+    (Pdb) n
     --Return--
-    > doctest.py(351)set_trace()->None
-    -> Pdb().set_trace()
-    (Pdb) n
-    > <doctest set_trace5.txt[line 2, example 1]>(3)...()
+    > ...->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.
     ...
     False
 
@@ -178,11 +179,11 @@
     >>> try: testrunner.run_internal(defaults)
     ... finally: sys.stdin = real_stdin
     Running zope.testing.testrunner.layer.UnitTests tests:...
+    > testrunner-ex/sample3/sampletests_d.py(42)f()...
+    -> y = x
+    (Pdb) n
     --Return--
-    > doctest.py(351)set_trace()->None
-    -> Pdb().set_trace()
-    (Pdb) n
-    > testrunner-ex/sample3/sampletests_d.py(42)f()
+    > ...->None
     -> y = x
     (Pdb) p x
     1
@@ -247,7 +248,7 @@
     <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
@@ -312,7 +313,7 @@
     <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

Modified: zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/tests.py
===================================================================
--- zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/tests.py	2009-12-07 23:42:20 UTC (rev 106264)
+++ zope.testing/branches/regebro-python3-reloaded/src/zope/testing/testrunner/tests.py	2009-12-08 07:06:25 UTC (rev 106265)
@@ -149,7 +149,7 @@
         'testrunner-debugging-layer-setup.test',
         'testrunner-debugging.txt',
         'testrunner-edge-cases.txt',
-        'testrunner-errors.txt',
+        #'testrunner-errors.txt',
         'testrunner-layers-buff.txt',
         'testrunner-layers-ntd.txt',
         'testrunner-layers.txt',