[Zope3-checkins] SVN: zope.testing/branches/regebro-doctest-patching/src/zope/testing/ Getting very close now. REPORT_ONLY_FIRST_FAILURE doesn't work in the testrunner.
Lennart Regebro
regebro at gmail.com
Tue Apr 20 03:35:31 EDT 2010
Log message for revision 111162:
Getting very close now. REPORT_ONLY_FIRST_FAILURE doesn't work in the testrunner.
Changed:
U zope.testing/branches/regebro-doctest-patching/src/zope/testing/doctest/__init__.py
U zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-colors.txt
U zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-errors.txt
U zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-layers-ntd.txt
U zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-layers.txt
U zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-progress.txt
U zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-test-selection.txt
-=-
Modified: zope.testing/branches/regebro-doctest-patching/src/zope/testing/doctest/__init__.py
===================================================================
--- zope.testing/branches/regebro-doctest-patching/src/zope/testing/doctest/__init__.py 2010-04-20 07:32:44 UTC (rev 111161)
+++ zope.testing/branches/regebro-doctest-patching/src/zope/testing/doctest/__init__.py 2010-04-20 07:35:31 UTC (rev 111162)
@@ -44,25 +44,30 @@
'debug',
]
+# Tell people to use the builtin module instead.
import warnings
-# Tell people to use the builtin module instead.
warnings.warn('zope.testing.doctest is deprecated in favour of '
'the Python standard library doctest module', DeprecationWarning,
stacklevel=2)
+
# Patch to fix an error that makes subsequent tests fail after you have
# returned unicode in a test.
import doctest
+
_org_SpoofOut = doctest._SpoofOut
class _patched_SpoofOut(_org_SpoofOut):
def truncate(self, size=None):
_org_SpoofOut.truncate(self, size)
if not self.buf:
self.buf = ''
+
doctest._SpoofOut = _patched_SpoofOut
+
# Patch to fix tests that has mixed line endings:
import os
+
def _patched_load_testfile(filename, package, module_relative):
if module_relative:
package = doctest._normalize_module(package, 3)
@@ -74,10 +79,39 @@
# conversion as universal newlines would do.
return file_contents.replace(os.linesep, '\n'), filename
return open(filename, 'U').read(), filename
+
doctest._load_testfile = _patched_load_testfile
+
# Use a special exception for the test runner:
from zope.testing.exceptions import DocTestFailureException
doctest.DocTestCase.failureException = DocTestFailureException
+
+# Patch to let the doctest have the globals of the testcase
+import unittest
+
+def _patched_init(self, test, optionflags=0, setUp=None, tearDown=None,
+ checker=None):
+ unittest.TestCase.__init__(self)
+ self._dt_optionflags = optionflags
+ self._dt_checker = checker
+ self._dt_test = test
+ self._dt_setUp = setUp
+ self._dt_tearDown = tearDown
+ self._dt_globs = test.globs.copy()
+
+def _patched_tearDown(self):
+ test = self._dt_test
+
+ if self._dt_tearDown is not None:
+ self._dt_tearDown(test)
+
+ test.globs.clear()
+ test.globs.update(self._dt_globs)
+
+doctest.DocTestCase.__init__ = _patched_init
+doctest.DocTestCase.tearDown = _patched_tearDown
+
+
from doctest import *
Modified: zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-colors.txt
===================================================================
--- zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-colors.txt 2010-04-20 07:32:44 UTC (rev 111161)
+++ zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-colors.txt 2010-04-20 07:35:31 UTC (rev 111162)
@@ -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.testing.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,7 +116,7 @@
{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[0]>", line 1, in ?{normal}
{red} f(){normal}
@@ -154,7 +154,7 @@
{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[1]>", line 1, in ?{normal}
{red} f(){normal}
@@ -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.testing.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
@@ -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.
Modified: zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-errors.txt
===================================================================
--- zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-errors.txt 2010-04-20 07:32:44 UTC (rev 111161)
+++ zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-errors.txt 2010-04-20 07:35:31 UTC (rev 111162)
@@ -42,7 +42,7 @@
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[0]>", line 1, in ?
f()
@@ -78,7 +78,7 @@
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[1]>", line 1, in ?
f()
@@ -129,7 +129,7 @@
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[0]>", line 1, in ?
f()
@@ -166,7 +166,7 @@
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[1]>", line 1, in ?
f()
@@ -207,19 +207,20 @@
Running zope.testing.testrunner.layer.UnitTests tests:
Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
Running:
- 1/47 (2.1%)
+ 1/56 (1.8%)
<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[0]>", line 1, in ?
f()
@@ -230,11 +231,11 @@
- __traceback_info__: I don't know what Y should be.
NameError: global name 'y' is not defined
<BLANKLINE>
- 2/47 (4.3%)##r##
+ 2/56 (3.6%)##r##
##r##
- 3/47 (6.4%)##r##
+ 3/56 (5.4%)##r##
##r##
- 4/47 (8.5%)
+ 4/56 (7.1%)
<BLANKLINE>
Error in test test3 (sample2.sampletests_e.Test)
Traceback (most recent call last):
@@ -247,11 +248,11 @@
- __traceback_info__: I don't know what Y should be.
NameError: global name 'y' is not defined
<BLANKLINE>
- 5/47 (8.9%)##r##
+ 5/56 (8.9%)##r##
##r##
- 6/47 (10.7%)##r##
+ 6/56 (10.7%)##r##
##r##
- 7/47 (12.5%)
+ 7/56 (12.5%)
<BLANKLINE>
Failure in test testrunner-ex/sample2/e.txt
Failed doctest test for e.txt
@@ -263,7 +264,7 @@
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[1]>", line 1, in ?
f()
@@ -271,7 +272,7 @@
return x
NameError: global name 'x' is not defined
<BLANKLINE>
- 8/47 (14.3%)
+ 8/56 (14.3%)
<BLANKLINE>
Failure in test test (sample2.sampletests_f.Test)
Traceback (most recent call last):
@@ -281,83 +282,83 @@
raise self.failureException, \
AssertionError: 1 != 0
<BLANKLINE>
- 9/47 (16.1%)##r##
+ 9/56 (16.1%)##r##
##r##
- 10/47 (17.9%)##r##
+ 10/56 (17.9%)##r##
##r##
- 11/47 (19.6%)##r##
+ 11/56 (19.6%)##r##
##r##
- 12/47 (21.4%)##r##
+ 12/56 (21.4%)##r##
##r##
- 13/47 (23.2%)##r##
+ 13/56 (23.2%)##r##
##r##
- 14/47 (25.0%)##r##
+ 14/56 (25.0%)##r##
##r##
- 15/47 (26.8%)##r##
+ 15/56 (26.8%)##r##
##r##
- 16/47 (28.6%)##r##
+ 16/56 (28.6%)##r##
##r##
- 17/47 (30.4%)##r##
+ 17/56 (30.4%)##r##
##r##
- 18/47 (32.1%)##r##
+ 18/56 (32.1%)##r##
##r##
- 19/47 (33.9%)##r##
+ 19/56 (33.9%)##r##
##r##
- 20/47 (35.7%)##r##
+ 20/56 (35.7%)##r##
##r##
- 24/47 (42.9%)##r##
+ 24/56 (42.9%)##r##
##r##
- 25/47 (44.6%)##r##
+ 25/56 (44.6%)##r##
##r##
- 26/47 (46.4%)##r##
+ 26/56 (46.4%)##r##
##r##
- 27/47 (48.2%)##r##
+ 27/56 (48.2%)##r##
##r##
- 28/47 (50.0%)##r##
+ 28/56 (50.0%)##r##
##r##
- 29/47 (51.8%)##r##
+ 29/56 (51.8%)##r##
##r##
- 30/47 (53.6%)##r##
+ 30/56 (53.6%)##r##
##r##
- 31/47 (55.4%)##r##
+ 31/56 (55.4%)##r##
##r##
- 32/47 (57.1%)##r##
+ 32/56 (57.1%)##r##
##r##
- 33/47 (58.9%)##r##
+ 33/56 (58.9%)##r##
##r##
- 34/47 (60.7%)##r##
+ 34/56 (60.7%)##r##
##r##
- 35/47 (62.5%)##r##
+ 35/56 (62.5%)##r##
##r##
- 36/47 (64.3%)##r##
+ 36/56 (64.3%)##r##
##r##
- 40/47 (71.4%)##r##
+ 40/56 (71.4%)##r##
##r##
- 41/47 (73.2%)##r##
+ 41/56 (73.2%)##r##
##r##
- 42/47 (75.0%)##r##
+ 42/56 (75.0%)##r##
##r##
- 43/47 (76.8%)##r##
+ 43/56 (76.8%)##r##
##r##
- 44/47 (78.6%)##r##
+ 44/56 (78.6%)##r##
##r##
- 45/47 (80.4%)##r##
+ 45/56 (80.4%)##r##
##r##
- 46/47 (82.1%)##r##
+ 46/56 (82.1%)##r##
##r##
- 47/47 (83.9%)##r##
+ 47/56 (83.9%)##r##
##r##
- 48/47 (85.7%)##r##
+ 48/56 (85.7%)##r##
##r##
- 49/47 (87.5%)##r##
+ 49/56 (87.5%)##r##
##r##
- 50/47 (89.3%)##r##
+ 50/56 (89.3%)##r##
##r##
- 51/47 (91.1%)##r##
+ 51/56 (91.1%)##r##
##r##
- 52/47 (92.9%)##r##
+ 52/56 (92.9%)##r##
##r##
- 56/47 (100.0%)##r##
+ 56/56 (100.0%)##r##
##r##
Ran 56 tests with 3 failures and 1 errors in 0.054 seconds.
Tearing down left over layers:
@@ -391,7 +392,7 @@
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[0]>", line 1, in ?
x = y
@@ -403,7 +404,7 @@
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[1]>", line 1, in ?
x
@@ -415,7 +416,7 @@
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[2]>", line 1, in ?
z = x + 1
@@ -448,7 +449,7 @@
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[0]>", line 1, in ?
x = y
@@ -475,13 +476,12 @@
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[0]>", line 1, in ?
x = y
@@ -511,37 +511,34 @@
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[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[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[2]>", line 1, in ?
z = x + 1
@@ -793,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
@@ -824,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.testing.testrunner.layer.UnitTests in N.NNN seconds.
True
@@ -881,10 +886,10 @@
Tear down samplelayers.Layer12 in N.NNN seconds.
Tear down samplelayers.Layer1 in N.NNN seconds.
Set up zope.testing.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.testing.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.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-layers-ntd.txt
===================================================================
--- zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-layers-ntd.txt 2010-04-20 07:32:44 UTC (rev 111161)
+++ zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-layers-ntd.txt 2010-04-20 07:35:31 UTC (rev 111162)
@@ -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.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-layers.txt
===================================================================
--- zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-layers.txt 2010-04-20 07:32:44 UTC (rev 111161)
+++ zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-layers.txt 2010-04-20 07:35:31 UTC (rev 111162)
@@ -79,7 +79,7 @@
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.
Modified: zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-progress.txt
===================================================================
--- zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-progress.txt 2010-04-20 07:32:44 UTC (rev 111161)
+++ zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-progress.txt 2010-04-20 07:35:31 UTC (rev 111162)
@@ -17,69 +17,71 @@
>>> from zope.testing 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 26 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 26 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 26 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.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-test-selection.txt
===================================================================
--- zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-test-selection.txt 2010-04-20 07:32:44 UTC (rev 111161)
+++ zope.testing/branches/regebro-doctest-patching/src/zope/testing/testrunner/testrunner-test-selection.txt 2010-04-20 07:35:31 UTC (rev 111162)
@@ -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.testing.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.testing.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.testing.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.testing.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.testing.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.testing.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -444,7 +444,7 @@
test_y0 (sampletests.test_one.TestA)
test_y1 (sampletests.test_one.TestB)
test_y0 (sampletests.test_one)
- Ran 28 tests with 0 failures and 0 errors in N.NNN seconds.
+ Ran 36 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
False
More information about the Zope3-Checkins
mailing list