[Zope3-checkins] SVN: zope.testing/trunk/src/zope/testing/testrunner Minor bugfix: ./test.py -vvv used to show test timings in seconds, but said the

Marius Gedminas marius at pov.lt
Fri Jan 12 18:12:33 EST 2007


Log message for revision 71989:
  Minor bugfix: ./test.py -vvv used to show test timings in seconds, but said the
  times were in milliseconds.
  
  

Changed:
  U   zope.testing/trunk/src/zope/testing/testrunner-edge-cases.txt
  U   zope.testing/trunk/src/zope/testing/testrunner-progress.txt
  U   zope.testing/trunk/src/zope/testing/testrunner-verbose.txt
  U   zope.testing/trunk/src/zope/testing/testrunner.py

-=-
Modified: zope.testing/trunk/src/zope/testing/testrunner-edge-cases.txt
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner-edge-cases.txt	2007-01-12 23:05:04 UTC (rev 71988)
+++ zope.testing/trunk/src/zope/testing/testrunner-edge-cases.txt	2007-01-12 23:12:33 UTC (rev 71989)
@@ -401,15 +401,15 @@
     Running samplelayers.Layer1 tests:
       Set up samplelayers.Layer1 in 0.000 seconds.
       Running:
-        test_x1 (sampletestsf.TestA1) (0.000 ms)
-        test_y0 (sampletestsf.TestA1) (0.000 ms)
-        test_z0 (sampletestsf.TestA1) (0.000 ms)
-        test_x0 (sampletestsf.TestB1) (0.000 ms)
-        test_y1 (sampletestsf.TestB1) (0.000 ms)
-        test_z0 (sampletestsf.TestB1) (0.000 ms)
-        test_1 (sampletestsf.TestNotMuch1) (0.000 ms)
-        test_2 (sampletestsf.TestNotMuch1) (0.000 ms)
-        test_3 (sampletestsf.TestNotMuch1) (0.000 ms)
+        test_x1 (sampletestsf.TestA1) (0.000 s)
+        test_y0 (sampletestsf.TestA1) (0.000 s)
+        test_z0 (sampletestsf.TestA1) (0.000 s)
+        test_x0 (sampletestsf.TestB1) (0.000 s)
+        test_y1 (sampletestsf.TestB1) (0.000 s)
+        test_z0 (sampletestsf.TestB1) (0.000 s)
+        test_1 (sampletestsf.TestNotMuch1) (0.000 s)
+        test_2 (sampletestsf.TestNotMuch1) (0.000 s)
+        test_3 (sampletestsf.TestNotMuch1) (0.000 s)
       Ran 9 tests with 0 failures and 0 errors in 0.001 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer1 in 0.000 seconds.

Modified: zope.testing/trunk/src/zope/testing/testrunner-progress.txt
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner-progress.txt	2007-01-12 23:05:04 UTC (rev 71988)
+++ zope.testing/trunk/src/zope/testing/testrunner-progress.txt	2007-01-12 23:12:33 UTC (rev 71989)
@@ -313,41 +313,41 @@
       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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\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 ms)\r
+        16/18 (88.9%) test_x0 (sampletests.test122) (0.001 s)\r
                                                               \r
-        17/18 (94.4%) test_y0 (sampletests.test122) (0.001 ms)\r
+        17/18 (94.4%) test_y0 (sampletests.test122) (0.001 s)\r
                                                               \r
-        18/18 (100.0%) test_z1 (sampletests.test122) (0.001 ms)\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.

Modified: zope.testing/trunk/src/zope/testing/testrunner-verbose.txt
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner-verbose.txt	2007-01-12 23:05:04 UTC (rev 71988)
+++ zope.testing/trunk/src/zope/testing/testrunner-verbose.txt	2007-01-12 23:12:33 UTC (rev 71989)
@@ -97,32 +97,32 @@
       Set up samplelayers.Layer12 in 0.000 seconds.
       Set up samplelayers.Layer122 in 0.000 seconds.
       Running:
-        test_x1 (sample1.sampletests.test122.TestA) (0.000 ms)
-        test_y0 (sample1.sampletests.test122.TestA) (0.000 ms)
-        test_z0 (sample1.sampletests.test122.TestA) (0.000 ms)
-        test_x0 (sample1.sampletests.test122.TestB) (0.000 ms)
-        test_y1 (sample1.sampletests.test122.TestB) (0.000 ms)
-        test_z0 (sample1.sampletests.test122.TestB) (0.000 ms)
-        test_1 (sample1.sampletests.test122.TestNotMuch) (0.000 ms)
-        test_2 (sample1.sampletests.test122.TestNotMuch) (0.000 ms)
-        test_3 (sample1.sampletests.test122.TestNotMuch) (0.000 ms)
-        test_x0 (sample1.sampletests.test122) (0.001 ms)
-        test_y0 (sample1.sampletests.test122) (0.001 ms)
-        test_z1 (sample1.sampletests.test122) (0.001 ms)
-        testrunner-ex/sample1/sampletests/../../sampletestsl.txt (0.001 ms)
-        test_x1 (sampletests.test122.TestA) (0.000 ms)
-        test_y0 (sampletests.test122.TestA) (0.000 ms)
-        test_z0 (sampletests.test122.TestA) (0.000 ms)
-        test_x0 (sampletests.test122.TestB) (0.000 ms)
-        test_y1 (sampletests.test122.TestB) (0.000 ms)
-        test_z0 (sampletests.test122.TestB) (0.000 ms)
-        test_1 (sampletests.test122.TestNotMuch) (0.000 ms)
-        test_2 (sampletests.test122.TestNotMuch) (0.000 ms)
-        test_3 (sampletests.test122.TestNotMuch) (0.000 ms)
-        test_x0 (sampletests.test122) (0.001 ms)
-        test_y0 (sampletests.test122) (0.001 ms)
-        test_z1 (sampletests.test122) (0.001 ms)
-        testrunner-ex/sampletests/../sampletestsl.txt (0.001 ms)
+        test_x1 (sample1.sampletests.test122.TestA) (0.000 s)
+        test_y0 (sample1.sampletests.test122.TestA) (0.000 s)
+        test_z0 (sample1.sampletests.test122.TestA) (0.000 s)
+        test_x0 (sample1.sampletests.test122.TestB) (0.000 s)
+        test_y1 (sample1.sampletests.test122.TestB) (0.000 s)
+        test_z0 (sample1.sampletests.test122.TestB) (0.000 s)
+        test_1 (sample1.sampletests.test122.TestNotMuch) (0.000 s)
+        test_2 (sample1.sampletests.test122.TestNotMuch) (0.000 s)
+        test_3 (sample1.sampletests.test122.TestNotMuch) (0.000 s)
+        test_x0 (sample1.sampletests.test122) (0.001 s)
+        test_y0 (sample1.sampletests.test122) (0.001 s)
+        test_z1 (sample1.sampletests.test122) (0.001 s)
+        testrunner-ex/sample1/sampletests/../../sampletestsl.txt (0.001 s)
+        test_x1 (sampletests.test122.TestA) (0.000 s)
+        test_y0 (sampletests.test122.TestA) (0.000 s)
+        test_z0 (sampletests.test122.TestA) (0.000 s)
+        test_x0 (sampletests.test122.TestB) (0.000 s)
+        test_y1 (sampletests.test122.TestB) (0.000 s)
+        test_z0 (sampletests.test122.TestB) (0.000 s)
+        test_1 (sampletests.test122.TestNotMuch) (0.000 s)
+        test_2 (sampletests.test122.TestNotMuch) (0.000 s)
+        test_3 (sampletests.test122.TestNotMuch) (0.000 s)
+        test_x0 (sampletests.test122) (0.001 s)
+        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.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.

Modified: zope.testing/trunk/src/zope/testing/testrunner.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner.py	2007-01-12 23:05:04 UTC (rev 71988)
+++ zope.testing/trunk/src/zope/testing/testrunner.py	2007-01-12 23:12:33 UTC (rev 71989)
@@ -823,13 +823,13 @@
     def addSuccess(self, test):
         if self.options.verbose > 2:
             t = max(time.time() - self._start_time, 0.0)
-            s = " (%.3f ms)" % t
+            s = " (%.3f s)" % t
             sys.stdout.write(s)
             self.test_width += len(s) + 1
 
     def addError(self, test, exc_info):
         if self.options.verbose > 2:
-            print " (%.3f ms)" % (time.time() - self._start_time)
+            print " (%.3f s)" % (time.time() - self._start_time)
 
         unittest.TestResult.addError(self, test, exc_info)
         print
@@ -852,7 +852,7 @@
 
 
         if self.options.verbose > 2:
-            print " (%.3f ms)" % (time.time() - self._start_time)
+            print " (%.3f s)" % (time.time() - self._start_time)
 
         unittest.TestResult.addFailure(self, test, exc_info)
         print
@@ -1826,6 +1826,13 @@
     if options.all:
         options.at_level = sys.maxint
 
+    if options.unit and options.non_unit:
+        # The test runner interpets this as "run only those tests that are both
+        # unit and non-unit at the same time".  The user, however, wants to run
+        # both unit and non-unit tests.  Disable the filtering so that the user
+        # will get what she wants:
+        options.unit = options.non_unit = False
+
     if options.unit:
         options.layer = ['unit']
     if options.layer:



More information about the Zope3-Checkins mailing list