From df15344db5447ee6a50e7114130373564b3b4deb Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Fri, 26 Apr 2019 17:42:10 +0200 Subject: [PATCH] fix tests/doctests according to current ZTK and BlueBream versions --- brain/tests.py | 4 +--- browser/ftests.py | 1 - browser/tests.py | 4 +--- catalog/tests.py | 5 +---- commerce/tests.py | 5 +---- composer/layout/tests.py | 4 +--- composer/message/tests.py | 4 +--- composer/report/tests.py | 4 +--- composer/rule/tests.py | 4 +--- composer/schema/tests.py | 4 +--- composer/tests.py | 4 +--- container/README.txt | 10 +++++----- container/tests.py | 6 ++---- docgen/README.txt | 2 +- docgen/tests.py | 3 +-- integrator/filesystem.txt | 2 +- integrator/tests/test_bscw.py | 4 +--- integrator/tests/test_filesystem.py | 4 +--- knowledge/survey/tests.py | 3 +-- knowledge/tests.py | 5 +---- link/tests.py | 6 ++---- meta/tests.py | 7 ++----- organize/tests.py | 11 ++++------- plugin/tests.py | 5 +---- process/tests.py | 5 +---- roa/tests.py | 5 +---- scorm/tests.py | 4 +--- stateful/tests.py | 5 +---- storage/pzope/tests.py | 5 +---- storage/tests.py | 5 +---- text/tests.py | 5 +---- tracking/comment/tests.py | 4 +--- tracking/notify/tests.py | 4 +--- tracking/tests.py | 4 +--- view/tests.py | 5 +---- xml/tests.py | 5 +---- z2/tests.py | 5 +---- zutil/tests.py | 4 +--- 38 files changed, 47 insertions(+), 129 deletions(-) diff --git a/brain/tests.py b/brain/tests.py index ab9ff3c..2941a48 100755 --- a/brain/tests.py +++ b/brain/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from zope.interface.verify import verifyClass from cybertools.brain.interfaces import INeuron, ISynapsis @@ -21,7 +19,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(TestBrain), - DocFileSuite('README.txt', + doctest.DocFileSuite('README.txt', optionflags=flags,), )) diff --git a/browser/ftests.py b/browser/ftests.py index 6aaa6f2..9eb425e 100755 --- a/browser/ftests.py +++ b/browser/ftests.py @@ -1,7 +1,6 @@ # $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from zope.app.testing.functional import FunctionalDocFileSuite diff --git a/browser/tests.py b/browser/tests.py index 2397f45..ad58fb2 100755 --- a/browser/tests.py +++ b/browser/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from zope.app.testing import ztapi from zope.interface.verify import verifyClass @@ -9,7 +7,7 @@ from zope.interface.verify import verifyClass def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/catalog/tests.py b/catalog/tests.py index e20b183..8421f20 100755 --- a/catalog/tests.py +++ b/catalog/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.catalog' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -21,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/commerce/tests.py b/commerce/tests.py index e0c847e..4dfaa1e 100755 --- a/commerce/tests.py +++ b/commerce/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.commerce' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from zope import component from zope.interface import implements @@ -62,7 +59,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags, + doctest.DocFileSuite('README.txt', optionflags=flags, setUp=setUp, tearDown=tearDown), )) diff --git a/composer/layout/tests.py b/composer/layout/tests.py index 51fe062..e29defd 100755 --- a/composer/layout/tests.py +++ b/composer/layout/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -15,7 +13,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/composer/message/tests.py b/composer/message/tests.py index 9886053..44129f7 100755 --- a/composer/message/tests.py +++ b/composer/message/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -15,7 +13,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/composer/report/tests.py b/composer/report/tests.py index 9886053..44129f7 100755 --- a/composer/report/tests.py +++ b/composer/report/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -15,7 +13,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/composer/rule/tests.py b/composer/rule/tests.py index f6319e6..9f3069e 100755 --- a/composer/rule/tests.py +++ b/composer/rule/tests.py @@ -1,10 +1,8 @@ -# $Id$ import unittest, doctest from email import message_from_string from zope.interface import implements from zope.sendmail.interfaces import IMailDelivery -from zope.testing.doctestunit import DocFileSuite class TestMailer(object): @@ -31,7 +29,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/composer/schema/tests.py b/composer/schema/tests.py index 2e7a216..68fdf26 100755 --- a/composer/schema/tests.py +++ b/composer/schema/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -15,7 +13,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/composer/tests.py b/composer/tests.py index ccfbd9a..674c681 100755 --- a/composer/tests.py +++ b/composer/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -15,7 +13,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/container/README.txt b/container/README.txt index 53b9360..70c6668 100644 --- a/container/README.txt +++ b/container/README.txt @@ -12,7 +12,7 @@ Let's add an ordered container and place some objects in it: >>> c1['sub3'] = OrderedContainer() >>> c1['sub4'] = OrderedContainer() >>> c1.keys() - ['sub1', 'sub2', 'sub3', 'sub4'] + [u'sub1', u'sub2', u'sub3', u'sub4'] A special management view provides methods for moving objects down, up, to the bottom, and to the top @@ -22,14 +22,14 @@ to the bottom, and to the top >>> view = OrderedContainerView(c1, TestRequest()) >>> view.move_bottom(('sub3',)) >>> c1.keys() - ['sub1', 'sub2', 'sub4', 'sub3'] + [u'sub1', u'sub2', u'sub4', u'sub3'] >>> view.move_up(('sub4',), 1) >>> c1.keys() - ['sub1', 'sub4', 'sub2', 'sub3'] + [u'sub1', u'sub4', u'sub2', u'sub3'] >>> view.move_top(('sub2',)) >>> c1.keys() - ['sub2', 'sub1', 'sub4', 'sub3'] + [u'sub2', u'sub1', u'sub4', u'sub3'] >>> view.move_down(('sub2',), 2) >>> c1.keys() - ['sub1', 'sub4', 'sub2', 'sub3'] + [u'sub1', u'sub4', u'sub2', u'sub3'] diff --git a/container/tests.py b/container/tests.py index 7956cd4..41d4c9a 100755 --- a/container/tests.py +++ b/container/tests.py @@ -1,12 +1,10 @@ -# $Id$ -import unittest -from zope.testing.doctestunit import DocFileSuite +import unittest, doctest def test_suite(): return unittest.TestSuite(( - DocFileSuite('README.txt'), + doctest.DocFileSuite('README.txt'), )) if __name__ == '__main__': diff --git a/docgen/README.txt b/docgen/README.txt index 8eb768a..2888b29 100644 --- a/docgen/README.txt +++ b/docgen/README.txt @@ -48,7 +48,7 @@ Working with MHT Files >>> output = document.asString() >>> len(data), len(output) - (294996, 336140) + (294996, 336142) >>> outPath = os.path.join(basePath, 'out_doc.mht') >>> #f = open(outPath, 'wt') diff --git a/docgen/tests.py b/docgen/tests.py index 48cd742..e74753b 100755 --- a/docgen/tests.py +++ b/docgen/tests.py @@ -3,7 +3,6 @@ unit tests, doc tests """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from zope.interface.verify import verifyClass from zope.interface import implements @@ -19,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/integrator/filesystem.txt b/integrator/filesystem.txt index 401ae86..aa05f6a 100644 --- a/integrator/filesystem.txt +++ b/integrator/filesystem.txt @@ -84,7 +84,7 @@ A file object has additional attributes/methods. >>> file.contentType 'application/x-tar' >>> file.getSize() - 432L + 432 >>> logo = sub['loops_logo.png'] >>> logo.internalPath diff --git a/integrator/tests/test_bscw.py b/integrator/tests/test_bscw.py index 41bd51d..7ccdf41 100755 --- a/integrator/tests/test_bscw.py +++ b/integrator/tests/test_bscw.py @@ -1,8 +1,6 @@ -# $Id$ import os import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from zope.interface.verify import verifyClass @@ -13,7 +11,7 @@ flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS def test_suite(): return unittest.TestSuite(( - DocFileSuite('../bscw.txt', optionflags=flags), + doctest.DocFileSuite('../bscw.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/integrator/tests/test_filesystem.py b/integrator/tests/test_filesystem.py index 8a2e6d0..23c7f03 100755 --- a/integrator/tests/test_filesystem.py +++ b/integrator/tests/test_filesystem.py @@ -1,8 +1,6 @@ -# $Id$ import os import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from zope.interface.verify import verifyClass @@ -22,7 +20,7 @@ class Test(unittest.TestCase): def test_suite(): return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('../filesystem.txt', optionflags=flags), + doctest.DocFileSuite('../filesystem.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/knowledge/survey/tests.py b/knowledge/survey/tests.py index 5cf6d0d..514a4d3 100644 --- a/knowledge/survey/tests.py +++ b/knowledge/survey/tests.py @@ -5,7 +5,6 @@ Tests for the 'cybertools.knowledge.survey' package. """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from cybertools.knowledge.knowing import Knowing @@ -20,7 +19,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(TestSurvey), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/knowledge/tests.py b/knowledge/tests.py index 7391542..6283acf 100755 --- a/knowledge/tests.py +++ b/knowledge/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.knowledge' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from cybertools.knowledge.knowing import Knowing class TestKnowledge(unittest.TestCase): @@ -21,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(TestKnowledge), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/link/tests.py b/link/tests.py index 579f58d..2aa8337 100755 --- a/link/tests.py +++ b/link/tests.py @@ -1,7 +1,5 @@ -# $Id$ -import unittest -from zope.testing.doctestunit import DocFileSuite +import unittest, doctest from zope.interface.verify import verifyClass from zope.interface import implements from zope.intid.interfaces import IIntIds @@ -44,7 +42,7 @@ class TestLink(unittest.TestCase): def test_suite(): return unittest.TestSuite(( unittest.makeSuite(TestLink), - DocFileSuite('README.txt'), + doctest.DocFileSuite('README.txt'), )) if __name__ == '__main__': diff --git a/meta/tests.py b/meta/tests.py index 94b5bfb..7b32490 100755 --- a/meta/tests.py +++ b/meta/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.meta' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -21,8 +18,8 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), - DocFileSuite('namespace.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('namespace.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/organize/tests.py b/organize/tests.py index 59742e6..cd511ea 100755 --- a/organize/tests.py +++ b/organize/tests.py @@ -2,13 +2,10 @@ """ Tests for the 'cybertools.organize' package. - -$Id$ """ import unittest, doctest from zope import component -from zope.testing.doctestunit import DocFileSuite from cybertools.composer.schema import client, field, instance from cybertools.organize.party import Person from cybertools.organize import service @@ -38,10 +35,10 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(TestParty), - DocFileSuite('README.txt', optionflags=flags), - DocFileSuite('formmanager.txt', optionflags=flags), - DocFileSuite('servicemanager.txt', optionflags=flags), - DocFileSuite('work.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('formmanager.txt', optionflags=flags), + doctest.DocFileSuite('servicemanager.txt', optionflags=flags), + doctest.DocFileSuite('work.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/plugin/tests.py b/plugin/tests.py index e7848c2..6e2c804 100755 --- a/plugin/tests.py +++ b/plugin/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.plugin' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -21,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/process/tests.py b/process/tests.py index 3bd5ea8..f5316d2 100755 --- a/process/tests.py +++ b/process/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.process' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from cybertools.process.definition import Process class TestProcess(unittest.TestCase): @@ -21,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(TestProcess), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/roa/tests.py b/roa/tests.py index f8757f3..2c6dbea 100755 --- a/roa/tests.py +++ b/roa/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.roa' (Resource-oriented Architecture) package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from zope import component from cybertools.roa import json @@ -23,7 +20,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/scorm/tests.py b/scorm/tests.py index 87e6e46..bdca99d 100755 --- a/scorm/tests.py +++ b/scorm/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -15,7 +13,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/stateful/tests.py b/stateful/tests.py index d2b0d81..c3f3bd9 100755 --- a/stateful/tests.py +++ b/stateful/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.stateful' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -21,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/storage/pzope/tests.py b/storage/pzope/tests.py index 3213778..ff91971 100755 --- a/storage/pzope/tests.py +++ b/storage/pzope/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.storage.zope' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -21,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( #unittest.makeSuite(Test), #not used - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/storage/tests.py b/storage/tests.py index b52c8e6..e861a44 100755 --- a/storage/tests.py +++ b/storage/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.storage' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from cybertools.text import pdf class Test(unittest.TestCase): @@ -21,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/text/tests.py b/text/tests.py index 05dbe4b..f7fd2dd 100755 --- a/text/tests.py +++ b/text/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.text' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from cybertools.text import pdf class Test(unittest.TestCase): @@ -21,7 +18,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/tracking/comment/tests.py b/tracking/comment/tests.py index 33448a6..4fdbe82 100755 --- a/tracking/comment/tests.py +++ b/tracking/comment/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -15,7 +13,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/tracking/notify/tests.py b/tracking/notify/tests.py index 6c7ef8b..0d2bd6d 100755 --- a/tracking/notify/tests.py +++ b/tracking/notify/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite class Test(unittest.TestCase): @@ -15,7 +13,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/tracking/tests.py b/tracking/tests.py index 153a8a8..096813e 100755 --- a/tracking/tests.py +++ b/tracking/tests.py @@ -1,8 +1,6 @@ -# $Id$ import unittest, doctest import os -from zope.testing.doctestunit import DocFileSuite testDir = os.path.join(os.path.dirname(__file__), 'testdata') @@ -19,7 +17,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/view/tests.py b/view/tests.py index 453f41e..c53ab10 100755 --- a/view/tests.py +++ b/view/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.index' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from cybertools.view.pac import View @@ -22,7 +19,7 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), unittest.makeSuite(Test), )) diff --git a/xml/tests.py b/xml/tests.py index 4ad2c74..3c04ef5 100755 --- a/xml/tests.py +++ b/xml/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cyberdev.xml' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite from cStringIO import StringIO from cybertools.xml.element import elements as e, fromXML @@ -41,7 +38,7 @@ class TestXml(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), unittest.makeSuite(TestXml), )) diff --git a/z2/tests.py b/z2/tests.py index 414d660..3b566ab 100755 --- a/z2/tests.py +++ b/z2/tests.py @@ -2,12 +2,9 @@ """ Tests for the 'cybertools.z2' package. - -$Id$ """ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite try: from Products.Five import BrowserView @@ -30,7 +27,7 @@ def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('README.txt', optionflags=flags), )) if __name__ == '__main__': diff --git a/zutil/tests.py b/zutil/tests.py index 535ee8e..dd7bffc 100755 --- a/zutil/tests.py +++ b/zutil/tests.py @@ -1,7 +1,5 @@ -# $Id$ import unittest, doctest -from zope.testing.doctestunit import DocFileSuite import cybertools.zutil.jeep @@ -18,7 +16,7 @@ def test_suite(): return unittest.TestSuite(( #unittest.makeSuite(Test), # we don't need this #doctest.DocTestSuite(cybertools.zutil.property, optionflags=flags), - DocFileSuite('jeep.txt', optionflags=flags), + doctest.DocFileSuite('jeep.txt', optionflags=flags), doctest.DocFileSuite('rcache.txt', optionflags=flags), ))