[Zope3-checkins] SVN: zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/test tests pass on win, move to linux

Adam Groszer agroszer at gmail.com
Sun Jun 7 11:27:11 EDT 2009


Log message for revision 100696:
  tests pass on win, move to linux

Changed:
  U   zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-errors.txt
  U   zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-progress.txt
  U   zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/tests.py

-=-
Modified: zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-errors.txt
===================================================================
--- zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-errors.txt	2009-06-07 15:26:43 UTC (rev 100695)
+++ zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-errors.txt	2009-06-07 15:27:10 UTC (rev 100696)
@@ -226,10 +226,10 @@
             x = y + 1
         NameError: global name 'y' is not defined
     <BLANKLINE>
-        2/56 (3.6%)\r
-                   \r
-        3/56 (5.4%)\r
-                   \r
+        2/56 (3.6%)##r##
+                   ##r##
+        3/56 (5.4%)##r##
+                   ##r##
         4/56 (7.1%)
     <BLANKLINE>
     Error in test test3 (sample2.sampletests_e.Test)
@@ -242,10 +242,10 @@
         x = y + 1
     NameError: global name 'y' is not defined
     <BLANKLINE>
-        5/56 (8.9%)\r
-                   \r
-        6/56 (10.7%)\r
-                    \r
+        5/56 (8.9%)##r##
+                   ##r##
+        6/56 (10.7%)##r##
+                    ##r##
         7/56 (12.5%)
     <BLANKLINE>
     Failure in test testrunner-ex/sample2/e.txt
@@ -276,84 +276,84 @@
         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
+        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##
     <BLANKLINE>
       Ran 56 tests with 3 failures and 1 errors in 0.054 seconds.
     Tearing down left over layers:

Modified: zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-progress.txt
===================================================================
--- zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-progress.txt	2009-06-07 15:26:43 UTC (rev 100695)
+++ zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-progress.txt	2009-06-07 15:27:10 UTC (rev 100696)
@@ -21,58 +21,58 @@
       Set up samplelayers.Layer12 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
       Running:
-        1/34 (2.9%)\r
-                   \r
-        2/34 (5.9%)\r
-                   \r
-        3/34 (8.8%)\r
-                   \r
-        4/34 (11.8%)\r
-                    \r
-        5/34 (14.7%)\r
-                    \r
-        6/34 (17.6%)\r
-                    \r
-        7/34 (20.6%)\r
-                    \r
-        8/34 (23.5%)\r
-                    \r
-        9/34 (26.5%)\r
-                    \r
-        10/34 (29.4%)\r
-                     \r
-        11/34 (32.4%)\r
-                     \r
-        12/34 (35.3%)\r
-                     \r
-        17/34 (50.0%)\r
-                     \r
-        18/34 (52.9%)\r
-                     \r
-        19/34 (55.9%)\r
-                     \r
-        20/34 (58.8%)\r
-                     \r
-        21/34 (61.8%)\r
-                     \r
-        22/34 (64.7%)\r
-                     \r
-        23/34 (67.6%)\r
-                     \r
-        24/34 (70.6%)\r
-                     \r
-        25/34 (73.5%)\r
-                     \r
-        26/34 (76.5%)\r
-                     \r
-        27/34 (79.4%)\r
-                     \r
-        28/34 (82.4%)\r
-                     \r
-        29/34 (85.3%)\r
-                     \r
-        34/34 (100.0%)\r
-                      \r
+        1/34 (2.9%)##r##
+                   ##r##
+        2/34 (5.9%)##r##
+                   ##r##
+        3/34 (8.8%)##r##
+                   ##r##
+        4/34 (11.8%)##r##
+                    ##r##
+        5/34 (14.7%)##r##
+                    ##r##
+        6/34 (17.6%)##r##
+                    ##r##
+        7/34 (20.6%)##r##
+                    ##r##
+        8/34 (23.5%)##r##
+                    ##r##
+        9/34 (26.5%)##r##
+                    ##r##
+        10/34 (29.4%)##r##
+                     ##r##
+        11/34 (32.4%)##r##
+                     ##r##
+        12/34 (35.3%)##r##
+                     ##r##
+        17/34 (50.0%)##r##
+                     ##r##
+        18/34 (52.9%)##r##
+                     ##r##
+        19/34 (55.9%)##r##
+                     ##r##
+        20/34 (58.8%)##r##
+                     ##r##
+        21/34 (61.8%)##r##
+                     ##r##
+        22/34 (64.7%)##r##
+                     ##r##
+        23/34 (67.6%)##r##
+                     ##r##
+        24/34 (70.6%)##r##
+                     ##r##
+        25/34 (73.5%)##r##
+                     ##r##
+        26/34 (76.5%)##r##
+                     ##r##
+        27/34 (79.4%)##r##
+                     ##r##
+        28/34 (82.4%)##r##
+                     ##r##
+        29/34 (85.3%)##r##
+                     ##r##
+        34/34 (100.0%)##r##
+                      ##r##
     <BLANKLINE>
       Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
     Tearing down left over layers:
@@ -81,7 +81,7 @@
       Tear down samplelayers.Layer1 in 0.000 seconds.
     False
 
-(Note that, in the examples above and below, we show "\r" followed by
+(Note that, in the examples above and below, we show "##r##" followed by
 new lines where carriage returns would appear in actual output.)
 
 Using a single level of verbosity causes test descriptions to be
@@ -96,58 +96,58 @@
   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
-                                                           \r
-    2/34 (5.9%) test_y0 (sample1.sampletests.test122.TestA)\r
-                                                           \r
-    3/34 (8.8%) test_z0 (sample1.sampletests.test122.TestA)\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
+    1/34 (2.9%) test_x1 (sample1.sampletests.test122.TestA)##r##
+                                                           ##r##
+    2/34 (5.9%) test_y0 (sample1.sampletests.test122.TestA)##r##
+                                                           ##r##
+    3/34 (8.8%) test_z0 (sample1.sampletests.test122.TestA)##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##
 <BLANKLINE>
   Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
 Tearing down left over layers:
@@ -173,58 +173,58 @@
       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
-                                                               \r
-        2/34 (5.9%) test_y0 (sample1.sampletests.test122.TestA)\r
-                                                               \r
-        3/34 (8.8%) test_z0 (sample1.sampletests.test122.TestA)\r
-                                                               \r
-        4/34 (11.8%) test_x0 (...le1.sampletests.test122.TestB)\r
-                                                               \r
-        5/34 (14.7%) test_y1 (...le1.sampletests.test122.TestB)\r
-                                                               \r
-        6/34 (17.6%) test_z0 (...le1.sampletests.test122.TestB)\r
-                                                               \r
-        7/34 (20.6%) test_1 (...ampletests.test122.TestNotMuch)\r
-                                                               \r
-        8/34 (23.5%) test_2 (...ampletests.test122.TestNotMuch)\r
-                                                               \r
-        9/34 (26.5%) test_3 (...ampletests.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%) ... e1/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%) ... r-ex/sampletests/../sampletestsl.txt\r
-                                                               \r
+        1/34 (2.9%) test_x1 (sample1.sampletests.test122.TestA)##r##
+                                                               ##r##
+        2/34 (5.9%) test_y0 (sample1.sampletests.test122.TestA)##r##
+                                                               ##r##
+        3/34 (8.8%) test_z0 (sample1.sampletests.test122.TestA)##r##
+                                                               ##r##
+        4/34 (11.8%) test_x0 (...le1.sampletests.test122.TestB)##r##
+                                                               ##r##
+        5/34 (14.7%) test_y1 (...le1.sampletests.test122.TestB)##r##
+                                                               ##r##
+        6/34 (17.6%) test_z0 (...le1.sampletests.test122.TestB)##r##
+                                                               ##r##
+        7/34 (20.6%) test_1 (...ampletests.test122.TestNotMuch)##r##
+                                                               ##r##
+        8/34 (23.5%) test_2 (...ampletests.test122.TestNotMuch)##r##
+                                                               ##r##
+        9/34 (26.5%) test_3 (...ampletests.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%) ... e1/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%) ... r-ex/sampletests/../sampletestsl.txt##r##
+                                                               ##r##
     <BLANKLINE>
       Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
     Tearing down left over layers:
@@ -246,54 +246,54 @@
       Set up samplelayers.Layer12 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
       Running:
-        1/24 (4.2%) test_x1 (sample1.sampletests.test122.TestA)\r
-                                                              \r
-        2/24 (8.3%) test_y0 (sample1.sampletests.test122.TestA)\r
-                                                              \r
-        3/24 (12.5%) test_z0 (sample1.sampletests.test122.TestA)\r
-                                                               \r
-        4/24 (16.7%) test_x0 (sample1.sampletests.test122.TestB)\r
-                                                               \r
-        5/24 (20.8%) test_y1 (sample1.sampletests.test122.TestB)\r
-                                                               \r
-        6/24 (25.0%) test_z0 (sample1.sampletests.test122.TestB)\r
-                                                               \r
-        7/24 (29.2%) test_1 (sample1.sampletests.test122.TestNotMuch)\r
-                                                                    \r
-        8/24 (33.3%) test_2 (sample1.sampletests.test122.TestNotMuch)\r
-                                                                    \r
-        9/24 (37.5%) test_3 (sample1.sampletests.test122.TestNotMuch)\r
-                                                                    \r
-        10/24 (41.7%) test_x0 (sample1.sampletests.test122)\r
-                                                          \r
-        11/24 (45.8%) test_y0 (sample1.sampletests.test122)\r
-                                                          \r
-        12/24 (50.0%) test_z1 (sample1.sampletests.test122)\r
-                                                          \r
-        13/24 (54.2%) test_x1 (sampletests.test122.TestA)\r
-                                                        \r
-        14/24 (58.3%) test_y0 (sampletests.test122.TestA)\r
-                                                        \r
-        15/24 (62.5%) test_z0 (sampletests.test122.TestA)\r
-                                                        \r
-        16/24 (66.7%) test_x0 (sampletests.test122.TestB)\r
-                                                        \r
-        17/24 (70.8%) test_y1 (sampletests.test122.TestB)\r
-                                                        \r
-        18/24 (75.0%) test_z0 (sampletests.test122.TestB)\r
-                                                        \r
-        19/24 (79.2%) test_1 (sampletests.test122.TestNotMuch)\r
-                                                             \r
-        20/24 (83.3%) test_2 (sampletests.test122.TestNotMuch)\r
-                                                             \r
-        21/24 (87.5%) test_3 (sampletests.test122.TestNotMuch)\r
-                                                             \r
-        22/24 (91.7%) test_x0 (sampletests.test122)\r
-                                                  \r
-        23/24 (95.8%) test_y0 (sampletests.test122)\r
-                                                  \r
-        24/24 (100.0%) test_z1 (sampletests.test122)\r
-                                                   \r
+        1/24 (4.2%) test_x1 (sample1.sampletests.test122.TestA)##r##
+                                                              ##r##
+        2/24 (8.3%) test_y0 (sample1.sampletests.test122.TestA)##r##
+                                                              ##r##
+        3/24 (12.5%) test_z0 (sample1.sampletests.test122.TestA)##r##
+                                                               ##r##
+        4/24 (16.7%) test_x0 (sample1.sampletests.test122.TestB)##r##
+                                                               ##r##
+        5/24 (20.8%) test_y1 (sample1.sampletests.test122.TestB)##r##
+                                                               ##r##
+        6/24 (25.0%) test_z0 (sample1.sampletests.test122.TestB)##r##
+                                                               ##r##
+        7/24 (29.2%) test_1 (sample1.sampletests.test122.TestNotMuch)##r##
+                                                                    ##r##
+        8/24 (33.3%) test_2 (sample1.sampletests.test122.TestNotMuch)##r##
+                                                                    ##r##
+        9/24 (37.5%) test_3 (sample1.sampletests.test122.TestNotMuch)##r##
+                                                                    ##r##
+        10/24 (41.7%) test_x0 (sample1.sampletests.test122)##r##
+                                                          ##r##
+        11/24 (45.8%) test_y0 (sample1.sampletests.test122)##r##
+                                                          ##r##
+        12/24 (50.0%) test_z1 (sample1.sampletests.test122)##r##
+                                                          ##r##
+        13/24 (54.2%) test_x1 (sampletests.test122.TestA)##r##
+                                                        ##r##
+        14/24 (58.3%) test_y0 (sampletests.test122.TestA)##r##
+                                                        ##r##
+        15/24 (62.5%) test_z0 (sampletests.test122.TestA)##r##
+                                                        ##r##
+        16/24 (66.7%) test_x0 (sampletests.test122.TestB)##r##
+                                                        ##r##
+        17/24 (70.8%) test_y1 (sampletests.test122.TestB)##r##
+                                                        ##r##
+        18/24 (75.0%) test_z0 (sampletests.test122.TestB)##r##
+                                                        ##r##
+        19/24 (79.2%) test_1 (sampletests.test122.TestNotMuch)##r##
+                                                             ##r##
+        20/24 (83.3%) test_2 (sampletests.test122.TestNotMuch)##r##
+                                                             ##r##
+        21/24 (87.5%) test_3 (sampletests.test122.TestNotMuch)##r##
+                                                             ##r##
+        22/24 (91.7%) test_x0 (sampletests.test122)##r##
+                                                  ##r##
+        23/24 (95.8%) test_y0 (sampletests.test122)##r##
+                                                  ##r##
+        24/24 (100.0%) test_z1 (sampletests.test122)##r##
+                                                   ##r##
     <BLANKLINE>
       Ran 24 tests with 0 failures and 0 errors in 0.006 seconds.
     Tearing down left over layers:
@@ -313,42 +313,42 @@
       Set up samplelayers.Layer12 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
       Running:
-        1/18 (5.6%) test_x1 (sample1.sampletests.test122.TestA) (0.000 s)\r
-                                                                          \r
-        2/18 (11.1%) test_y0 (sample1.sampletests.test122.TestA) (0.000 s)\r
-                                                                           \r
-        3/18 (16.7%) test_z0 (sample1.sampletests.test122.TestA) (0.000 s)\r
-                                                                           \r
-        4/18 (22.2%) test_x0 (sample1.sampletests.test122.TestB) (0.000 s)\r
-                                                                           \r
-        5/18 (27.8%) test_y1 (sample1.sampletests.test122.TestB) (0.000 s)\r
-                                                                           \r
-        6/18 (33.3%) test_z0 (sample1.sampletests.test122.TestB) (0.000 s)\r
-                                                                           \r
-        7/18 (38.9%) test_x0 (sample1.sampletests.test122) (0.001 s)\r
-                                                                     \r
-        8/18 (44.4%) test_y0 (sample1.sampletests.test122) (0.001 s)\r
-                                                                     \r
-        9/18 (50.0%) test_z1 (sample1.sampletests.test122) (0.001 s)\r
-                                                                     \r
-        10/18 (55.6%) test_x1 (sampletests.test122.TestA) (0.000 s)\r
-                                                                    \r
-        11/18 (61.1%) test_y0 (sampletests.test122.TestA) (0.000 s)\r
-                                                                    \r
-        12/18 (66.7%) test_z0 (sampletests.test122.TestA) (0.000 s)\r
-                                                                    \r
-        13/18 (72.2%) test_x0 (sampletests.test122.TestB) (0.000 s)\r
-                                                                    \r
-        14/18 (77.8%) test_y1 (sampletests.test122.TestB) (0.000 s)\r
-                                                                    \r
-        15/18 (83.3%) test_z0 (sampletests.test122.TestB) (0.000 s)\r
-                                                                    \r
-        16/18 (88.9%) test_x0 (sampletests.test122) (0.001 s)\r
-                                                              \r
-        17/18 (94.4%) test_y0 (sampletests.test122) (0.001 s)\r
-                                                              \r
-        18/18 (100.0%) test_z1 (sampletests.test122) (0.001 s)\r
-                                                               \r
+        1/18 (5.6%) test_x1 (sample1.sampletests.test122.TestA) (0.000 s)##r##
+                                                                          ##r##
+        2/18 (11.1%) test_y0 (sample1.sampletests.test122.TestA) (0.000 s)##r##
+                                                                           ##r##
+        3/18 (16.7%) test_z0 (sample1.sampletests.test122.TestA) (0.000 s)##r##
+                                                                           ##r##
+        4/18 (22.2%) test_x0 (sample1.sampletests.test122.TestB) (0.000 s)##r##
+                                                                           ##r##
+        5/18 (27.8%) test_y1 (sample1.sampletests.test122.TestB) (0.000 s)##r##
+                                                                           ##r##
+        6/18 (33.3%) test_z0 (sample1.sampletests.test122.TestB) (0.000 s)##r##
+                                                                           ##r##
+        7/18 (38.9%) test_x0 (sample1.sampletests.test122) (0.001 s)##r##
+                                                                     ##r##
+        8/18 (44.4%) test_y0 (sample1.sampletests.test122) (0.001 s)##r##
+                                                                     ##r##
+        9/18 (50.0%) test_z1 (sample1.sampletests.test122) (0.001 s)##r##
+                                                                     ##r##
+        10/18 (55.6%) test_x1 (sampletests.test122.TestA) (0.000 s)##r##
+                                                                    ##r##
+        11/18 (61.1%) test_y0 (sampletests.test122.TestA) (0.000 s)##r##
+                                                                    ##r##
+        12/18 (66.7%) test_z0 (sampletests.test122.TestA) (0.000 s)##r##
+                                                                    ##r##
+        13/18 (72.2%) test_x0 (sampletests.test122.TestB) (0.000 s)##r##
+                                                                    ##r##
+        14/18 (77.8%) test_y1 (sampletests.test122.TestB) (0.000 s)##r##
+                                                                    ##r##
+        15/18 (83.3%) test_z0 (sampletests.test122.TestB) (0.000 s)##r##
+                                                                    ##r##
+        16/18 (88.9%) test_x0 (sampletests.test122) (0.001 s)##r##
+                                                              ##r##
+        17/18 (94.4%) test_y0 (sampletests.test122) (0.001 s)##r##
+                                                              ##r##
+        18/18 (100.0%) test_z1 (sampletests.test122) (0.001 s)##r##
+                                                               ##r##
     <BLANKLINE>
       Ran 18 tests with 0 failures and 0 errors in 0.006 seconds.
     Tearing down left over layers:
@@ -387,18 +387,18 @@
     Running zope.testing.testrunner.layer.UnitTests tests:
       Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
       Running:
-        1/6 (16.7%)\r
-                   \r
-        2/6 (33.3%)\r
-                   \r
-        3/6 (50.0%)\r
-                   \r
-        4/6 (66.7%)\r
-                   \r
-        5/6 (83.3%)\r
-                   \r
-        6/6 (100.0%)\r
-                    \r
+        1/6 (16.7%)##r##
+                   ##r##
+        2/6 (33.3%)##r##
+                   ##r##
+        3/6 (50.0%)##r##
+                   ##r##
+        4/6 (66.7%)##r##
+                   ##r##
+        5/6 (83.3%)##r##
+                   ##r##
+        6/6 (100.0%)##r##
+                    ##r##
     <BLANKLINE>
       Ran 6 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
@@ -435,6 +435,3 @@
     Tearing down left over layers:
       Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
     False
-
-
-

Modified: zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/tests.py
===================================================================
--- zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/tests.py	2009-06-07 15:26:43 UTC (rev 100695)
+++ zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/tests.py	2009-06-07 15:27:10 UTC (rev 100696)
@@ -26,45 +26,103 @@
 from zope.testing import renormalizing
 
 
-checker = renormalizing.RENormalizing([
-    # 2.5 changed the way pdb reports exceptions
-    (re.compile(r"<class 'exceptions.(\w+)Error'>:"),
-                r'exceptions.\1Error:'),
+if sys.platform == 'win32':
+    checker = renormalizing.RENormalizing([
+        # 2.5 changed the way pdb reports exceptions
+        (re.compile(r"<class 'exceptions.(\w+)Error'>:"),
+                    r'exceptions.\1Error:'),
 
-    (re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
-    (re.compile(r"<module>"),(r'?')),
-    (re.compile(r"<type 'exceptions.(\w+)Error'>:"),
-                r'exceptions.\1Error:'),
-    (re.compile("'[A-Za-z]:\\\\"), "'"), # hopefully, we'll make Windows happy
-    (re.compile(r'\\\\'), '/'), # more Windows happiness
-    (re.compile(r'\\'), '/'), # even more Windows happiness
-    (re.compile('/r'), '\\\\r'), # undo damage from previous
-    (re.compile(r'\r'), '\\\\r\n'),
-    (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
-    (re.compile(r'\d+[.]\d\d\d s'), 'N.NNN s'),
-    (re.compile(r'\d+[.]\d\d\d{'), 'N.NNN{'),
-    (re.compile('( |")[^\n]+testrunner-ex'), r'\1testrunner-ex'),
-    (re.compile('( |")[^\n]+testrunner.py'), r'\1testrunner.py'),
-    (re.compile(r'> [^\n]*(doc|unit)test[.]py\(\d+\)'),
-                r'\1test.py(NNN)'),
-    (re.compile(r'[.]py\(\d+\)'), r'.py(NNN)'),
-    (re.compile(r'[.]py:\d+'), r'.py:NNN'),
-    (re.compile(r' line \d+,', re.IGNORECASE), r' Line NNN,'),
-    (re.compile(r' line {([a-z]+)}\d+{', re.IGNORECASE), r' Line {\1}NNN{'),
+        #rewrite pdb prompt to ... the current location
+        #windows, py2.4 pdb seems not to put the '>' on doctest locations
+        #therefore we cut it here
+        (re.compile('^> doctest[^\n]+->None$', re.M), '...->None'),
 
-    # omit traceback entries for unittest.py or doctest.py from
-    # output:
-    (re.compile(r'^ +File "[^\n]*(doc|unit)test.py", [^\n]+\n[^\n]+\n',
-                re.MULTILINE),
-     r''),
-    (re.compile(r'^{\w+} +File "{\w+}[^\n]*(doc|unit)test.py{\w+}", [^\n]+\n[^\n]+\n',
-                re.MULTILINE),
-     r''),
-    (re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
-    (re.compile('import pdb; pdb'), 'Pdb()'), # Py 2.3
-    ])
+        #rewrite pdb prompt to ... the current location
+        (re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
 
+        (re.compile(r"<module>"),(r'?')),
+        (re.compile(r"<type 'exceptions.(\w+)Error'>:"),
+                    r'exceptions.\1Error:'),
 
+        (re.compile("'[A-Za-z]:\\\\"), "'"), # hopefully, we'll make Windows happy
+                                             # replaces drives with nothing
+
+        (re.compile(r'\\\\'), '/'), # more Windows happiness
+                                    # double backslashes in coverage???
+
+        (re.compile(r'\\'), '/'), # even more Windows happiness
+                                  # replaces backslashes in paths
+
+        (re.compile('/r'), '\\\\r'), # undo damage from previous
+
+        #(re.compile(r'\\r'), '\\\\r\n'),
+        (re.compile('##r##'), '\r'), #this is a magic to put linefeeds into the
+                                     #doctest
+
+        #(re.compile(r'/r'), ' '),
+
+        (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
+        (re.compile(r'\d+[.]\d\d\d s'), 'N.NNN s'),
+        (re.compile(r'\d+[.]\d\d\d{'), 'N.NNN{'),
+        (re.compile('( |")[^\n]+testrunner-ex'), r'\1testrunner-ex'),
+        (re.compile('( |")[^\n]+testrunner.py'), r'\1testrunner.py'),
+        (re.compile(r'> [^\n]*(doc|unit)test[.]py\(\d+\)'),
+                    r'\1test.py(NNN)'),
+        (re.compile(r'[.]py\(\d+\)'), r'.py(NNN)'),
+        (re.compile(r'[.]py:\d+'), r'.py:NNN'),
+        (re.compile(r' line \d+,', re.IGNORECASE), r' Line NNN,'),
+        (re.compile(r' line {([a-z]+)}\d+{', re.IGNORECASE), r' Line {\1}NNN{'),
+
+        # omit traceback entries for unittest.py or doctest.py from
+        # output:
+        (re.compile(r'^ +File "[^\n]*(doc|unit)test.py", [^\n]+\n[^\n]+\n',
+                    re.MULTILINE),
+         r''),
+        (re.compile(r'^{\w+} +File "{\w+}[^\n]*(doc|unit)test.py{\w+}", [^\n]+\n[^\n]+\n',
+                    re.MULTILINE),
+         r''),
+        #(re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
+        (re.compile('import pdb; pdb'), 'Pdb()'), # Py 2.3
+        ])
+else:
+    #*nix
+    checker = renormalizing.RENormalizing([
+        # 2.5 changed the way pdb reports exceptions
+        (re.compile(r"<class 'exceptions.(\w+)Error'>:"),
+                    r'exceptions.\1Error:'),
+
+        #rewrite pdb prompt to ... the current location
+        (re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
+
+        (re.compile(r"<module>"),(r'?')),
+        (re.compile(r"<type 'exceptions.(\w+)Error'>:"),
+                    r'exceptions.\1Error:'),
+
+        (re.compile(r'\r'), '\\\\r\n'),
+
+        (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
+        (re.compile(r'\d+[.]\d\d\d s'), 'N.NNN s'),
+        (re.compile(r'\d+[.]\d\d\d{'), 'N.NNN{'),
+        (re.compile('( |")[^\n]+testrunner-ex'), r'\1testrunner-ex'),
+        (re.compile('( |")[^\n]+testrunner.py'), r'\1testrunner.py'),
+        (re.compile(r'> [^\n]*(doc|unit)test[.]py\(\d+\)'),
+                    r'\1test.py(NNN)'),
+        (re.compile(r'[.]py\(\d+\)'), r'.py(NNN)'),
+        (re.compile(r'[.]py:\d+'), r'.py:NNN'),
+        (re.compile(r' line \d+,', re.IGNORECASE), r' Line NNN,'),
+        (re.compile(r' line {([a-z]+)}\d+{', re.IGNORECASE), r' Line {\1}NNN{'),
+
+        # omit traceback entries for unittest.py or doctest.py from
+        # output:
+        (re.compile(r'^ +File "[^\n]*(doc|unit)test.py", [^\n]+\n[^\n]+\n',
+                    re.MULTILINE),
+         r''),
+        (re.compile(r'^{\w+} +File "{\w+}[^\n]*(doc|unit)test.py{\w+}", [^\n]+\n[^\n]+\n',
+                    re.MULTILINE),
+         r''),
+        (re.compile('import pdb; pdb'), 'Pdb()'), # Py 2.3
+        ])
+
 def setUp(test):
     test.globs['saved-sys-info'] = (
         sys.path[:],



More information about the Zope3-Checkins mailing list