diff --git a/loops/browser/lobo/tests.py b/loops/browser/lobo/tests.py index 3509550..2e4fd5f 100755 --- a/loops/browser/lobo/tests.py +++ b/loops/browser/lobo/tests.py @@ -1,3 +1,4 @@ +# loops.browser.lobo.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/classifier/tests.py b/loops/classifier/tests.py index e6bb966..8b972f4 100755 --- a/loops/classifier/tests.py +++ b/loops/classifier/tests.py @@ -1,3 +1,4 @@ +# loops.classifier.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/compound/tests.py b/loops/compound/tests.py index ed26281..593a6ea 100755 --- a/loops/compound/tests.py +++ b/loops/compound/tests.py @@ -1,5 +1,4 @@ -# tests.py -# Package loops.compound +# loops.compound.tests import unittest, doctest from zope.app.testing import ztapi @@ -16,9 +15,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/config/tests.py b/loops/config/tests.py index f1e56ee..7593a2f 100755 --- a/loops/config/tests.py +++ b/loops/config/tests.py @@ -1,3 +1,4 @@ +# loops.config.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -13,9 +14,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/constraint/tests.py b/loops/constraint/tests.py index 074e78a..727265f 100755 --- a/loops/constraint/tests.py +++ b/loops/constraint/tests.py @@ -1,3 +1,4 @@ +# loops.constraint.tests import unittest, doctest from zope.app.testing import ztapi @@ -14,9 +15,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/expert/tests.py b/loops/expert/tests.py index 95827ba..99e67e4 100755 --- a/loops/expert/tests.py +++ b/loops/expert/tests.py @@ -1,3 +1,4 @@ +# loops.expert.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -20,10 +21,10 @@ def test_suite(): return unittest.TestSuite() # do nothing flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - doctest.DocFileSuite('search.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + doctest.DocFileSuite('search.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/external/tests.py b/loops/external/tests.py index 71d0415..6604344 100755 --- a/loops/external/tests.py +++ b/loops/external/tests.py @@ -1,3 +1,4 @@ +# loops.external.tests import unittest, doctest import os @@ -17,9 +18,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/i18n/tests.py b/loops/i18n/tests.py index 6f3b214..098a567 100755 --- a/loops/i18n/tests.py +++ b/loops/i18n/tests.py @@ -1,3 +1,4 @@ +# loops.i18n.tests import unittest, doctest from zope.app.testing import ztapi @@ -14,9 +15,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/integrator/content/tests.py b/loops/integrator/content/tests.py index 26afcb2..dda8907 100755 --- a/loops/integrator/content/tests.py +++ b/loops/integrator/content/tests.py @@ -1,3 +1,4 @@ +# loops.integrator.content.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/integrator/tests.py b/loops/integrator/tests.py index 8544865..40cfe10 100755 --- a/loops/integrator/tests.py +++ b/loops/integrator/tests.py @@ -1,3 +1,4 @@ +# loops.integrator.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/knowledge/tests.py b/loops/knowledge/tests.py index 16fee64..be86686 100755 --- a/loops/knowledge/tests.py +++ b/loops/knowledge/tests.py @@ -1,3 +1,4 @@ +# loops.knowledge.tests import os import unittest, doctest @@ -39,9 +40,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/layout/tests.py b/loops/layout/tests.py index 6e587c5..0929f45 100755 --- a/loops/layout/tests.py +++ b/loops/layout/tests.py @@ -1,3 +1,4 @@ +# loops.layout.tests import unittest, doctest @@ -21,9 +22,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/media/tests.py b/loops/media/tests.py index c135b0b..b768f53 100644 --- a/loops/media/tests.py +++ b/loops/media/tests.py @@ -1,7 +1,6 @@ -#! /usr/bin/python +# loops.media.tests -""" -Tests for the 'loops.media' package. +""" Tests for the 'loops.media' package. """ import unittest, doctest @@ -18,9 +17,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/organize/comment/tests.py b/loops/organize/comment/tests.py index 50a1dfb..759202d 100755 --- a/loops/organize/comment/tests.py +++ b/loops/organize/comment/tests.py @@ -1,3 +1,4 @@ +# loops.organize.comment.tests import unittest, doctest @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/organize/job/tests.py b/loops/organize/job/tests.py index 2d6663f..496eebb 100755 --- a/loops/organize/job/tests.py +++ b/loops/organize/job/tests.py @@ -1,3 +1,4 @@ +# loops.organize.job.tests import os import unittest, doctest @@ -16,9 +17,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/organize/personal/tests.py b/loops/organize/personal/tests.py index 739b790..8aa7e3a 100755 --- a/loops/organize/personal/tests.py +++ b/loops/organize/personal/tests.py @@ -1,3 +1,4 @@ +# loops.organize.personal.tests import unittest, doctest @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/organize/process/tests.py b/loops/organize/process/tests.py index b5406a9..d4c8682 100755 --- a/loops/organize/process/tests.py +++ b/loops/organize/process/tests.py @@ -1,3 +1,4 @@ +# loops.organize.process.tests import unittest, doctest from zope.app.testing import ztapi @@ -14,9 +15,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/organize/stateful/tests.py b/loops/organize/stateful/tests.py index 853bce7..129ed76 100755 --- a/loops/organize/stateful/tests.py +++ b/loops/organize/stateful/tests.py @@ -1,7 +1,6 @@ -#! /usr/bin/python +# loops.organize.stateful -""" -Tests for the 'loops.stateful' package. +""" Tests for the 'loops.stateful' package. """ import unittest, doctest @@ -17,7 +16,7 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), + unittest.TestLoader().loadTestsFromTestCase(Test), doctest.DocFileSuite('README.txt', optionflags=flags), )) diff --git a/loops/organize/tests.py b/loops/organize/tests.py index 3a0ceb4..a15751f 100755 --- a/loops/organize/tests.py +++ b/loops/organize/tests.py @@ -1,3 +1,4 @@ +# loops.organize.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -82,9 +83,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/organize/tracking/tests.py b/loops/organize/tracking/tests.py index d980fb4..d53660d 100755 --- a/loops/organize/tracking/tests.py +++ b/loops/organize/tracking/tests.py @@ -1,3 +1,4 @@ +# loops.organize.tracking.tests import os import unittest, doctest @@ -16,9 +17,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/organize/work/tests.py b/loops/organize/work/tests.py index 44257ab..9498494 100755 --- a/loops/organize/work/tests.py +++ b/loops/organize/work/tests.py @@ -1,3 +1,4 @@ +# loops.organize.work.tests import unittest, doctest @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/rest/tests.py b/loops/rest/tests.py index cb0475a..f3fbd2b 100755 --- a/loops/rest/tests.py +++ b/loops/rest/tests.py @@ -1,3 +1,4 @@ +# loops.rest.tests import unittest, doctest @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/storage/tests/test_storage.py b/loops/storage/tests/test_storage.py index 1ab64af..fd0604c 100644 --- a/loops/storage/tests/test_storage.py +++ b/loops/storage/tests/test_storage.py @@ -77,7 +77,7 @@ class TestStorage(common.TestCase): def test_suite(): return unittest.TestSuite(( - unittest.makeSuite(TestStorage), + unittest.TestLoader().loadTestsFromTestCase(TestStorage), )) diff --git a/loops/system/sync/tests.py b/loops/system/sync/tests.py index 1ca6a20..3f9699f 100755 --- a/loops/system/sync/tests.py +++ b/loops/system/sync/tests.py @@ -1,3 +1,4 @@ +#loops.system.sync.tests import unittest, doctest import os @@ -17,9 +18,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/system/tests.py b/loops/system/tests.py index 430badd..1f5b797 100755 --- a/loops/system/tests.py +++ b/loops/system/tests.py @@ -1,3 +1,4 @@ +# loops.system.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -12,9 +13,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/tests/test_loops.py b/loops/tests/test_loops.py index e2df9b2..52049b6 100755 --- a/loops/tests/test_loops.py +++ b/loops/tests/test_loops.py @@ -1,3 +1,4 @@ +# loops.tests.test_loops import unittest, doctest import warnings @@ -45,10 +46,10 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('../README.txt', optionflags=flags), - doctest.DocFileSuite('../helpers.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('../README.txt', optionflags=flags), + doctest.DocFileSuite('../helpers.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/loops/versioning/tests.py b/loops/versioning/tests.py index b85f36a..66d0338 100755 --- a/loops/versioning/tests.py +++ b/loops/versioning/tests.py @@ -1,3 +1,4 @@ +# loops.versioning.tests import unittest, doctest from zope.interface.verify import verifyClass @@ -13,9 +14,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite')