[Checkins] SVN: zope.testrunner/trunk/s No longer using zope.testing.doctest.
Lennart Regebro
regebro at gmail.com
Wed Apr 28 05:41:43 EDT 2010
Log message for revision 111535:
No longer using zope.testing.doctest.
Changed:
A zope.testrunner/trunk/setup.cfg
U zope.testrunner/trunk/setup.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gc0.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gc1.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gcset.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gcstats.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/pledge.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sample11/sampletests.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sample13/sampletests.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test1.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test11.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test111.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test112.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test12.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test121.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test122.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test_one.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletestsf.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/do-not-enter/sampletests.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/donotenter/sampletests.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests/test_1.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests/testone.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_1.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_e.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_ntds.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/stderrtest.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample3/sampletests.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample3/sampletests_d.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test1.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test11.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test111.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test112.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test12.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test121.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test122.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test_one.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletestsf.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/unicode.py
U zope.testrunner/trunk/src/zope/testrunner/tests.py
-=-
Copied: zope.testrunner/trunk/setup.cfg (from rev 111534, zope.testrunner/branches/no-zope-doctest/setup.cfg)
===================================================================
--- zope.testrunner/trunk/setup.cfg (rev 0)
+++ zope.testrunner/trunk/setup.cfg 2010-04-28 09:41:43 UTC (rev 111535)
@@ -0,0 +1,3 @@
+[egg_info]
+tag_build = dev
+tag_svn_revision = true
Modified: zope.testrunner/trunk/setup.py
===================================================================
--- zope.testrunner/trunk/setup.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/setup.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -95,6 +95,5 @@
['zope-testrunner = zope.testrunner:run',]},
include_package_data = True,
zip_safe = False,
- test_suite = 'zope.testrunner.tests.test_suite',
dependency_links = ['.'], # Only until the release of zope.testing 4.0.0
)
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gc0.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gc0.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gc0.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-from zope.testing import doctest
+import doctest
def make_sure_gc_is_disabled():
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gc1.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gc1.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gc1.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-from zope.testing import doctest
+import doctest
def make_sure_gc_threshold_is_one():
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gcset.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gcset.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gcset.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-from zope.testing import doctest
+import doctest
def make_sure_gc_threshold_is_701_11_9():
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gcstats.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gcstats.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/gcstats.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-from zope.testing import doctest
+import doctest
def generate_some_gc_statistics():
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/pledge.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/pledge.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/pledge.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-from zope.testing import doctest
+import doctest
pledge_template = """\
I give my pledge, as %s,
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sample11/sampletests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sample11/sampletests.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sample11/sampletests.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -94,12 +94,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sample13/sampletests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sample13/sampletests.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sample13/sampletests.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test1.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test1.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test1.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test11.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test11.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test11.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer11'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test111.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test111.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test111.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer111'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test112.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test112.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test112.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer112'
@@ -86,9 +86,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -98,6 +100,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test12.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test12.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test12.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer12'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test121.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test121.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test121.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer121'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test122.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test122.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test122.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer122'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test_one.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test_one.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletests/test_one.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletestsf.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletestsf.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample1/sampletestsf.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/do-not-enter/sampletests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/do-not-enter/sampletests.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/do-not-enter/sampletests.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
def f():
g()
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/donotenter/sampletests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/donotenter/sampletests.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/donotenter/sampletests.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
def f():
g()
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests/test_1.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests/test_1.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests/test_1.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests/testone.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests/testone.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests/testone.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_1.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_1.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_1.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -12,7 +12,7 @@
#
##############################################################################
-from zope.testing import doctest
+import doctest
def eek(self):
"""
@@ -26,4 +26,4 @@
"""
def test_suite():
- return doctest.DocTestSuite(optionflags=doctest.REPORT_NDIFF)
+ return doctest.DocTestSuite()
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_e.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_e.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_e.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
def f():
g()
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_ntds.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_ntds.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sampletests_ntds.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -17,7 +17,7 @@
"""
import unittest
-from zope.testing import doctest
+import doctest
class Layer:
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/stderrtest.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/stderrtest.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/stderrtest.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -17,7 +17,7 @@
"""
import unittest
-from zope.testing import doctest
+import doctest
import sys
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample3/sampletests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample3/sampletests.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample3/sampletests.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample3/sampletests_d.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample3/sampletests_d.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample3/sampletests_d.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -17,7 +17,7 @@
"""
import unittest
-from zope.testing import doctest
+import doctest
class TestSomething(unittest.TestCase):
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test1.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test1.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test1.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test11.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test11.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test11.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer11'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test111.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test111.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test111.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer111'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test112.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test112.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test112.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer112'
@@ -92,9 +92,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -104,6 +106,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test12.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test12.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test12.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer12'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test121.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test121.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test121.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer121'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test122.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test122.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test122.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
import samplelayers
layername = 'samplelayers.Layer122'
@@ -85,9 +85,11 @@
test.globs['z'] = 1
test.globs['layer'] = layer.layer
test.globs['layerx'] = layer.layerx
+ test.globs['samplelayers'] = samplelayers
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
@@ -97,6 +99,7 @@
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test_one.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test_one.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletests/test_one.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -61,12 +61,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletestsf.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletestsf.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sampletestsf.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
x=0
y=0
@@ -79,12 +79,14 @@
def test_y0(self):
"""
+ >>> y = 0
>>> y
0
"""
def test_x0(self):
"""
+ >>> x = 0
>>> x
0
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/unicode.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/unicode.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/unicode.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -12,7 +12,7 @@
#
##############################################################################
-from zope.testing import doctest
+import doctest
def test_suite():
return doctest.DocFileSuite('unicode.txt')
Modified: zope.testrunner/trunk/src/zope/testrunner/tests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/tests.py 2010-04-28 09:36:20 UTC (rev 111534)
+++ zope.testrunner/trunk/src/zope/testrunner/tests.py 2010-04-28 09:41:43 UTC (rev 111535)
@@ -22,7 +22,7 @@
import sys
import unittest
-from zope.testing import doctest
+import doctest
from zope.testing import renormalizing
More information about the checkins
mailing list