Fix the test control support for the pickle & cPickle tests so the tests run
under regrtest.
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 06a554e..6265676 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 @@
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()