[Python-checkins] CVS: python/dist/src/Lib/test test_pickle.py,1.8,1.9 test_cpickle.py,1.9,1.10

2001年12月19日 08:42:17 -0800

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv7926
Modified Files:
	test_pickle.py test_cpickle.py 
Log Message:
Fix the test control support for the pickle & cPickle tests so the tests run
under regrtest.
Index: test_pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pickle.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_pickle.py	2001年10月18日 21:57:37	1.8
--- test_pickle.py	2001年12月19日 16:42:15	1.9
***************
*** 1,6 ****
 import pickle
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
- from test_support import run_unittest
 
 class PickleTests(AbstractPickleTests, AbstractPickleModuleTests):
--- 1,7 ----
 import pickle
+ import test_support
+ import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
 
 class PickleTests(AbstractPickleTests, AbstractPickleModuleTests):
***************
*** 29,33 ****
 return u.load()
 
 if __name__ == "__main__":
! run_unittest(PickleTests)
! run_unittest(PicklerTests)
--- 30,40 ----
 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__":
! test_main()
Index: test_cpickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cpickle.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_cpickle.py	2001年10月18日 21:57:37	1.9
--- test_cpickle.py	2001年12月19日 16:42:15	1.10
***************
*** 1,6 ****
 import cPickle
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
- from test_support import run_unittest
 
 class cPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
--- 1,7 ----
 import cPickle
+ import test_support
+ import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
 
 class cPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
***************
*** 80,86 ****
 self)
 
 if __name__ == "__main__":
! run_unittest(cPickleTests)
! run_unittest(cPicklePicklerTests)
! run_unittest(cPickleListPicklerTests)
! run_unittest(cPickleFastPicklerTests)
--- 81,93 ----
 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__":
! test_main()