From e48480465607cdfa9680685bb3c0fb5b78d1f28d Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Wed, 19 Dec 2001 16:42:15 +0000 Subject: Fix the test control support for the pickle & cPickle tests so the tests run under regrtest. --- Lib/test/test_cpickle.py | 17 ++++++++++++----- Lib/test/test_pickle.py | 13 ++++++++++--- 2 files changed, 22 insertions(+), 8 deletions(-) (limited to 'Lib/test') diff --git a/Lib/test/test_cpickle.py b/Lib/test/test_cpickle.py index 8047bc54ee..dda606f3a4 100644 --- a/Lib/test/test_cpickle.py +++ b/Lib/test/test_cpickle.py @@ -1,7 +1,8 @@ import cPickle +import test_support +import unittest from cStringIO import StringIO from pickletester import AbstractPickleTests, AbstractPickleModuleTests -from test_support import run_unittest class cPickleTests(AbstractPickleTests, AbstractPickleModuleTests): @@ -79,8 +80,14 @@ class cPickleFastPicklerTests(AbstractPickleTests): AbstractPickleTests.test_recursive_multi, self) +def test_main(): + loader = unittest.TestLoader() + suite = unittest.TestSuite() + suite.addTest(loader.loadTestsFromTestCase(cPickleTests)) + suite.addTest(loader.loadTestsFromTestCase(cPicklePicklerTests)) + suite.addTest(loader.loadTestsFromTestCase(cPickleListPicklerTests)) + suite.addTest(loader.loadTestsFromTestCase(cPickleFastPicklerTests)) + test_support.run_suite(suite) + if __name__ == "__main__": - run_unittest(cPickleTests) - run_unittest(cPicklePicklerTests) - run_unittest(cPickleListPicklerTests) - run_unittest(cPickleFastPicklerTests) + test_main() diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py index 06a554e05e..6265676533 100644 --- a/Lib/test/test_pickle.py +++ b/Lib/test/test_pickle.py @@ -1,7 +1,8 @@ import pickle +import test_support +import unittest from cStringIO import StringIO from pickletester import AbstractPickleTests, AbstractPickleModuleTests -from test_support import run_unittest class PickleTests(AbstractPickleTests, AbstractPickleModuleTests): @@ -28,6 +29,12 @@ class PicklerTests(AbstractPickleTests): u = pickle.Unpickler(f) return u.load() +def test_main(): + loader = unittest.TestLoader() + suite = unittest.TestSuite() + suite.addTest(loader.loadTestsFromTestCase(PickleTests)) + suite.addTest(loader.loadTestsFromTestCase(PicklerTests)) + test_support.run_suite(suite) + if __name__ == "__main__": - run_unittest(PickleTests) - run_unittest(PicklerTests) + test_main() -- cgit v1.2.1