[Python-checkins] python/dist/src/Lib/test test_StringIO.py,1.15,1.16 test___all__.py,1.29,1.30 test_base64.py,1.5,1.6 test_bisect.py,1.8,1.9 test_bool.py,1.11,1.12 test_builtin.py,1.18,1.19 test_bz2.py,1.13,1.14 test_calendar.py,1.4,1.5 test_call.py,1.3,1.4 test_cfgparser.py,1.19,1.20 test_charmapcodec.py,1.6,1.7 test_codeccallbacks.py,1.11,1.12 test_codecs.py,1.8,1.9 test_copy.py,1.7,1.8 test_cpickle.py,1.14,1.15 test_csv.py,1.5,1.6 test_dummy_thread.py,1.3,1.4 test_enumerate.py,1.3,1.4 test_filecmp.py,1.1,1.2 test_getargs2.py,1.4,1.5 test_grp.py,1.15,1.16 test_hexoct.py,1.3,1.4 test_hmac.py,1.6,1.7 test_isinstance.py,1.6,1.7 test_itertools.py,1.5,1.6 test_optparse.py,1.1,1.2 test_os.py,1.17,1.18 test_parser.py,1.16,1.17 test_pep277.py,1.5,1.6 test_pickle.py,1.17,1.18 test_posix.py,1.5,1.6 test_pow.py,1.17,1.18 test_profilehooks.py,1.9,1.10 test_pwd.py,1.16,1.17 test_re.py,1.41,1.42 test_richcmp.py,1.8,1.9 test_sets.py,1.23,1.24 test_shelve.py,1.4,1.5 test_shutil.py,1.1,1.2 test_socket.py,1.63,1.64 test_str.py,1.2,1.3 test_string.py,1.24,1.25 test_strptime.py,1.12,1.13 test_support.py,1.51,1.52 test_sys.py,1.6,1.7 test_tarfile.py,1.7,1.8 test_tempfile.py,1.13,1.14 test_textwrap.py,1.18,1.19 test_timeout.py,1.13,1.14 test_trace.py,1.8,1.9 test_ucn.py,1.13,1.14 test_unicode.py,1.82,1.83 test_unicodedata.py,1.8,1.9 test_univnewlines.py,1.4,1.5 test_urllib.py,1.12,1.13 test_urllibnet.py,1.1,1.2 test_userdict.py,1.14,1.15 test_userlist.py,1.8,1.9 test_userstring.py,1.10,1.11 test_weakref.py,1.22,1.23 test_xpickle.py,1.3,1.4 test_zipimport.py,1.7,1.8 test_zlib.py,1.22,1.23
doerwalter@users.sourceforge.net
doerwalter@users.sourceforge.net
Thu, 01 May 2003 10:46:11 -0700
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv18305
Modified Files:
test_StringIO.py test___all__.py test_base64.py test_bisect.py
test_bool.py test_builtin.py test_bz2.py test_calendar.py
test_call.py test_cfgparser.py test_charmapcodec.py
test_codeccallbacks.py test_codecs.py test_copy.py
test_cpickle.py test_csv.py test_dummy_thread.py
test_enumerate.py test_filecmp.py test_getargs2.py test_grp.py
test_hexoct.py test_hmac.py test_isinstance.py
test_itertools.py test_optparse.py test_os.py test_parser.py
test_pep277.py test_pickle.py test_posix.py test_pow.py
test_profilehooks.py test_pwd.py test_re.py test_richcmp.py
test_sets.py test_shelve.py test_shutil.py test_socket.py
test_str.py test_string.py test_strptime.py test_support.py
test_sys.py test_tarfile.py test_tempfile.py test_textwrap.py
test_timeout.py test_trace.py test_ucn.py test_unicode.py
test_unicodedata.py test_univnewlines.py test_urllib.py
test_urllibnet.py test_userdict.py test_userlist.py
test_userstring.py test_weakref.py test_xpickle.py
test_zipimport.py test_zlib.py
Log Message:
Combine the functionality of test_support.run_unittest()
and test_support.run_classtests() into run_unittest()
and use it wherever possible.
Also don't use "from test.test_support import ...", but
"from test import test_support" in a few spots.
>From SF patch #662807.
Index: test_StringIO.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_StringIO.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_StringIO.py 24 Apr 2003 15:50:10 -0000 1.15
--- test_StringIO.py 1 May 2003 17:45:30 -0000 1.16
***************
*** 106,113 ****
def test_main():
! test_support.run_unittest(TestStringIO)
! test_support.run_unittest(TestcStringIO)
! test_support.run_unittest(TestBufferStringIO)
! test_support.run_unittest(TestBuffercStringIO)
if __name__ == '__main__':
--- 106,115 ----
def test_main():
! test_support.run_unittest(
! TestStringIO,
! TestcStringIO,
! TestBufferStringIO,
! TestBuffercStringIO
! )
if __name__ == '__main__':
Index: test___all__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test___all__.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** test___all__.py 15 Apr 2003 11:10:33 -0000 1.29
--- test___all__.py 1 May 2003 17:45:31 -0000 1.30
***************
*** 193,199 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(AllTest))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 193,197 ----
def test_main():
! test_support.run_unittest(AllTest)
if __name__ == "__main__":
Index: test_base64.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_base64.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_base64.py 22 Aug 2002 19:18:56 -0000 1.5
--- test_base64.py 1 May 2003 17:45:31 -0000 1.6
***************
*** 1,15 ****
! from unittest import TestCase
! from test.test_support import vereq, run_unittest
! from base64 import encodestring, decodestring
! class Base64TestCase(TestCase):
def test_encodestring(self):
! vereq(encodestring("www.python.org"), "d3d3LnB5dGhvbi5vcmc=\n")
! vereq(encodestring("a"), "YQ==\n")
! vereq(encodestring("ab"), "YWI=\n")
! vereq(encodestring("abc"), "YWJj\n")
! vereq(encodestring(""), "")
! vereq(encodestring("abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789!@#0^&*();:<>,. []{}"),
--- 1,15 ----
! import unittest
! from test import test_support
! import base64
! class Base64TestCase(unittest.TestCase):
def test_encodestring(self):
! self.assertEqual(base64.encodestring("www.python.org"), "d3d3LnB5dGhvbi5vcmc=\n")
! self.assertEqual(base64.encodestring("a"), "YQ==\n")
! self.assertEqual(base64.encodestring("ab"), "YWI=\n")
! self.assertEqual(base64.encodestring("abc"), "YWJj\n")
! self.assertEqual(base64.encodestring(""), "")
! self.assertEqual(base64.encodestring("abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789!@#0^&*();:<>,. []{}"),
***************
*** 19,27 ****
def test_decodestring(self):
! vereq(decodestring("d3d3LnB5dGhvbi5vcmc=\n"), "www.python.org")
! vereq(decodestring("YQ==\n"), "a")
! vereq(decodestring("YWI=\n"), "ab")
! vereq(decodestring("YWJj\n"), "abc")
! vereq(decodestring("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n"),
--- 19,27 ----
def test_decodestring(self):
! self.assertEqual(base64.decodestring("d3d3LnB5dGhvbi5vcmc=\n"), "www.python.org")
! self.assertEqual(base64.decodestring("YQ==\n"), "a")
! self.assertEqual(base64.decodestring("YWI=\n"), "ab")
! self.assertEqual(base64.decodestring("YWJj\n"), "abc")
! self.assertEqual(base64.decodestring("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n"),
***************
*** 29,36 ****
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789!@#0^&*();:<>,. []{}")
! vereq(decodestring(''), '')
def test_main():
! run_unittest(Base64TestCase)
if __name__ == "__main__":
--- 29,36 ----
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789!@#0^&*();:<>,. []{}")
! self.assertEqual(base64.decodestring(''), '')
def test_main():
! test_support.run_unittest(Base64TestCase)
if __name__ == "__main__":
Index: test_bisect.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bisect.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_bisect.py 27 Apr 2003 07:54:23 -0000 1.8
--- test_bisect.py 1 May 2003 17:45:32 -0000 1.9
***************
*** 199,204 ****
def test_main(verbose=None):
from test import test_bisect
! test_support.run_classtests(TestBisect,
! TestInsort)
test_support.run_doctest(test_bisect, verbose)
--- 199,203 ----
def test_main(verbose=None):
from test import test_bisect
! test_support.run_unittest(TestBisect, TestInsort)
test_support.run_doctest(test_bisect, verbose)
Index: test_bool.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bool.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_bool.py 1 May 2003 13:12:34 -0000 1.11
--- test_bool.py 1 May 2003 17:45:32 -0000 1.12
***************
*** 322,326 ****
def test_main():
! test_support.run_classtests(BoolTest)
if __name__ == "__main__":
--- 322,326 ----
def test_main():
! test_support.run_unittest(BoolTest)
if __name__ == "__main__":
Index: test_builtin.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_builtin.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** test_builtin.py 22 Apr 2003 08:12:30 -0000 1.18
--- test_builtin.py 1 May 2003 17:45:33 -0000 1.19
***************
*** 1220,1226 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(BuiltinTest))
! test.test_support.run_suite(suite)
if __name__ == "__main__":
--- 1220,1224 ----
def test_main():
! test.test_support.run_unittest(BuiltinTest)
if __name__ == "__main__":
Index: test_bz2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bz2.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_bz2.py 29 Apr 2003 14:53:08 -0000 1.13
--- test_bz2.py 1 May 2003 17:45:34 -0000 1.14
***************
*** 310,320 ****
def test_main():
! suite = unittest.TestSuite()
! for test in (BZ2FileTest,
! BZ2CompressorTest,
! BZ2DecompressorTest,
! FuncTest):
! suite.addTest(unittest.makeSuite(test))
! test_support.run_suite(suite)
if __name__ == '__main__':
--- 310,319 ----
def test_main():
! test_support.run_unittest(
! BZ2FileTest,
! BZ2CompressorTest,
! BZ2DecompressorTest,
! FuncTest
! )
if __name__ == '__main__':
Index: test_calendar.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_calendar.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_calendar.py 23 Jul 2002 19:03:45 -0000 1.4
--- test_calendar.py 1 May 2003 17:45:34 -0000 1.5
***************
*** 2,6 ****
import unittest
! from test.test_support import run_unittest
--- 2,6 ----
import unittest
! from test import test_support
***************
*** 56,60 ****
def test_main():
! run_unittest(CalendarTestCase)
if __name__ == "__main__":
--- 56,60 ----
def test_main():
! test_support.run_unittest(CalendarTestCase)
if __name__ == "__main__":
Index: test_call.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_call.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_call.py 23 Jul 2002 19:03:45 -0000 1.3
--- test_call.py 1 May 2003 17:45:34 -0000 1.4
***************
*** 1,4 ****
import unittest
! from test.test_support import run_unittest
# The test cases here cover several paths through the function calling
--- 1,4 ----
import unittest
! from test import test_support
# The test cases here cover several paths through the function calling
***************
*** 125,129 ****
def test_main():
! run_unittest(CFunctionCalls)
--- 125,129 ----
def test_main():
! test_support.run_unittest(CFunctionCalls)
Index: test_cfgparser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cfgparser.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** test_cfgparser.py 31 Dec 2002 06:57:25 -0000 1.19
--- test_cfgparser.py 1 May 2003 17:45:34 -0000 1.20
***************
*** 323,331 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTests([unittest.makeSuite(ConfigParserTestCase),
! unittest.makeSuite(RawConfigParserTestCase),
! unittest.makeSuite(SafeConfigParserTestCase)])
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 323,331 ----
def test_main():
! test_support.run_unittest(
! ConfigParserTestCase,
! RawConfigParserTestCase,
! SafeConfigParserTestCase
! )
if __name__ == "__main__":
Index: test_charmapcodec.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_charmapcodec.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_charmapcodec.py 14 Feb 2003 11:21:53 -0000 1.6
--- test_charmapcodec.py 1 May 2003 17:45:35 -0000 1.7
***************
*** 40,46 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(CharmapCodecTest))
! test.test_support.run_suite(suite)
if __name__ == "__main__":
--- 40,44 ----
def test_main():
! test.test_support.run_unittest(CharmapCodecTest)
if __name__ == "__main__":
Index: test_codeccallbacks.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_codeccallbacks.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_codeccallbacks.py 29 Apr 2003 20:59:55 -0000 1.11
--- test_codeccallbacks.py 1 May 2003 17:45:36 -0000 1.12
***************
*** 660,666 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(CodecCallbackTest))
! test.test_support.run_suite(suite)
if __name__ == "__main__":
--- 660,664 ----
def test_main():
! test.test_support.run_unittest(CodecCallbackTest)
if __name__ == "__main__":
Index: test_codecs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_codecs.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_codecs.py 24 Apr 2003 16:02:51 -0000 1.8
--- test_codecs.py 1 May 2003 17:45:36 -0000 1.9
***************
*** 334,344 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(UTF16Test))
! suite.addTest(unittest.makeSuite(EscapeDecodeTest))
! suite.addTest(unittest.makeSuite(RecodingTest))
! suite.addTest(unittest.makeSuite(PunycodeTest))
! suite.addTest(unittest.makeSuite(NameprepTest))
! test_support.run_suite(suite)
--- 334,344 ----
def test_main():
! test_support.run_unittest(
! UTF16Test,
! EscapeDecodeTest,
! RecodingTest,
! PunycodeTest,
! NameprepTest
! )
Index: test_copy.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_copy.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_copy.py 19 Feb 2003 01:19:28 -0000 1.7
--- test_copy.py 1 May 2003 17:45:36 -0000 1.8
***************
*** 517,523 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(TestCopy))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 517,521 ----
def test_main():
! test_support.run_unittest(TestCopy)
if __name__ == "__main__":
Index: test_cpickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cpickle.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_cpickle.py 21 Feb 2003 20:14:35 -0000 1.14
--- test_cpickle.py 1 May 2003 17:45:36 -0000 1.15
***************
*** 93,103 ****
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__":
--- 93,102 ----
def test_main():
! test_support.run_unittest(
! cPickleTests,
! cPicklePicklerTests,
! cPickleListPicklerTests,
! cPickleFastPicklerTests
! )
if __name__ == "__main__":
Index: test_csv.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_csv.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_csv.py 25 Apr 2003 14:43:14 -0000 1.5
--- test_csv.py 1 May 2003 17:45:36 -0000 1.6
***************
*** 7,11 ****
import csv
import gc
! from test.test_support import verbose
class Test_Csv(unittest.TestCase):
--- 7,11 ----
import csv
import gc
! from test import test_support
class Test_Csv(unittest.TestCase):
***************
*** 569,573 ****
if not hasattr(sys, "gettotalrefcount"):
! if verbose: print "*** skipping leakage tests ***"
else:
class NUL:
--- 569,573 ----
if not hasattr(sys, "gettotalrefcount"):
! if test_support.verbose: print "*** skipping leakage tests ***"
else:
class NUL:
***************
*** 641,654 ****
self.assertEqual(delta < 5, True)
! def _testclasses():
mod = sys.modules[__name__]
! return [getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
!
! def suite():
! suite = unittest.TestSuite()
! for testclass in _testclasses():
! suite.addTest(unittest.makeSuite(testclass))
! return suite
if __name__ == '__main__':
! unittest.main(defaultTest='suite')
--- 641,650 ----
self.assertEqual(delta < 5, True)
! def test_main():
mod = sys.modules[__name__]
! test_support.run_unittest(
! *[getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
! )
if __name__ == '__main__':
! test_main()
Index: test_dummy_thread.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dummy_thread.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_dummy_thread.py 30 Apr 2003 03:03:37 -0000 1.3
--- test_dummy_thread.py 1 May 2003 17:45:36 -0000 1.4
***************
*** 163,171 ****
print
print "*** Using %s as _thread module ***" % _thread
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(LockTests))
! suite.addTest(unittest.makeSuite(MiscTests))
! suite.addTest(unittest.makeSuite(ThreadTests))
! test_support.run_suite(suite)
if __name__ == '__main__':
--- 163,167 ----
print
print "*** Using %s as _thread module ***" % _thread
! test_support.run_unittest(LockTests, MiscTests, ThreadTests)
if __name__ == '__main__':
Index: test_enumerate.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_enumerate.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_enumerate.py 23 Jul 2002 19:03:50 -0000 1.3
--- test_enumerate.py 1 May 2003 17:45:37 -0000 1.4
***************
*** 105,116 ****
enum = MyEnum
- def suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(EnumerateTestCase))
- suite.addTest(unittest.makeSuite(SubclassTestCase))
- return suite
-
def test_main():
! test_support.run_suite(suite())
if __name__ == "__main__":
--- 105,110 ----
enum = MyEnum
def test_main():
! test_support.run_unittest(EnumerateTestCase, SubclassTestCase)
if __name__ == "__main__":
Index: test_filecmp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_filecmp.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_filecmp.py 6 Feb 2003 17:42:45 -0000 1.1
--- test_filecmp.py 1 May 2003 17:45:37 -0000 1.2
***************
*** 120,127 ****
def test_main():
! suite = unittest.TestSuite()
! for cls in FileCompareTestCase, DirCompareTestCase:
! suite.addTest(unittest.makeSuite(cls))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 120,124 ----
def test_main():
! test_support.run_unittest(FileCompareTestCase, DirCompareTestCase)
if __name__ == "__main__":
Index: test_getargs2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_getargs2.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_getargs2.py 24 Apr 2003 16:15:29 -0000 1.4
--- test_getargs2.py 1 May 2003 17:45:37 -0000 1.5
***************
*** 224,230 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(Signed_TestCase))
! suite.addTest(unittest.makeSuite(Unsigned_TestCase))
try:
from _testcapi import getargs_L, getargs_K
--- 224,228 ----
def test_main():
! tests = [Signed_TestCase, Unsigned_TestCase]
try:
from _testcapi import getargs_L, getargs_K
***************
*** 232,237 ****
pass # PY_LONG_LONG not available
else:
! suite.addTest(unittest.makeSuite(LongLong_TestCase))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 230,235 ----
pass # PY_LONG_LONG not available
else:
! tests.append(LongLong_TestCase)
! test_support.run_unittest(*tests)
if __name__ == "__main__":
Index: test_grp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_grp.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_grp.py 23 Apr 2003 19:50:24 -0000 1.15
--- test_grp.py 1 May 2003 17:45:37 -0000 1.16
***************
*** 98,104 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(GroupDatabaseTestCase))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 98,102 ----
def test_main():
! test_support.run_unittest(GroupDatabaseTestCase)
if __name__ == "__main__":
Index: test_hexoct.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_hexoct.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_hexoct.py 18 Feb 2003 15:45:44 -0000 1.3
--- test_hexoct.py 1 May 2003 17:45:37 -0000 1.4
***************
*** 119,125 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(TextHexOct))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 119,123 ----
def test_main():
! test_support.run_unittest(TextHexOct)
if __name__ == "__main__":
Index: test_hmac.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_hmac.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_hmac.py 22 Aug 2002 19:38:14 -0000 1.6
--- test_hmac.py 1 May 2003 17:45:37 -0000 1.7
***************
*** 104,113 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(TestVectorsTestCase))
! suite.addTest(unittest.makeSuite(ConstructorTestCase))
! suite.addTest(unittest.makeSuite(SanityTestCase))
! suite.addTest(unittest.makeSuite(CopyTestCase))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 104,113 ----
def test_main():
! test_support.run_unittest(
! TestVectorsTestCase,
! ConstructorTestCase,
! SanityTestCase,
! CopyTestCase
! )
if __name__ == "__main__":
Index: test_isinstance.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_isinstance.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_isinstance.py 12 Dec 2002 19:14:07 -0000 1.6
--- test_isinstance.py 1 May 2003 17:45:37 -0000 1.7
***************
*** 249,257 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(TestIsInstanceExceptions))
! suite.addTest(unittest.makeSuite(TestIsSubclassExceptions))
! suite.addTest(unittest.makeSuite(TestIsInstanceIsSubclass))
! test_support.run_suite(suite)
--- 249,257 ----
def test_main():
! test_support.run_unittest(
! TestIsInstanceExceptions,
! TestIsSubclassExceptions,
! TestIsInstanceIsSubclass
! )
Index: test_itertools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_itertools.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_itertools.py 23 Feb 2003 04:40:07 -0000 1.5
--- test_itertools.py 1 May 2003 17:45:37 -0000 1.6
***************
*** 163,169 ****
import test_itertools
suite = unittest.TestSuite()
! for testclass in (TestBasicOps,
! ):
! suite.addTest(unittest.makeSuite(testclass))
test_support.run_suite(suite)
test_support.run_doctest(test_itertools, verbose)
--- 163,167 ----
import test_itertools
suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(TestBasicOps))
test_support.run_suite(suite)
test_support.run_doctest(test_itertools, verbose)
Index: test_optparse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_optparse.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_optparse.py 21 Apr 2003 02:41:25 -0000 1.1
--- test_optparse.py 1 May 2003 17:45:38 -0000 1.2
***************
*** 1194,1209 ****
funcargs=[s, wordmap])
- def _testclasses():
- mod = sys.modules[__name__]
- return [getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
-
- def suite():
- suite = unittest.TestSuite()
- for testclass in _testclasses():
- suite.addTest(unittest.makeSuite(testclass))
- return suite
-
def test_main():
! test_support.run_suite(suite())
if __name__ == '__main__':
--- 1194,1202 ----
funcargs=[s, wordmap])
def test_main():
! mod = sys.modules[__name__]
! test_support.run_unittest(
! *[getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
! )
if __name__ == '__main__':
Index: test_os.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_os.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_os.py 28 Apr 2003 03:13:03 -0000 1.17
--- test_os.py 1 May 2003 17:45:43 -0000 1.18
***************
*** 6,24 ****
import unittest
import warnings
warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__)
warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__)
- from test.test_support import TESTFN, run_classtests
-
class TemporaryFileTests(unittest.TestCase):
def setUp(self):
self.files = []
! os.mkdir(TESTFN)
def tearDown(self):
for name in self.files:
os.unlink(name)
! os.rmdir(TESTFN)
def check_tempfile(self, name):
--- 6,23 ----
import unittest
import warnings
+ from test import test_support
warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__)
warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__)
class TemporaryFileTests(unittest.TestCase):
def setUp(self):
self.files = []
! os.mkdir(test_support.TESTFN)
def tearDown(self):
for name in self.files:
os.unlink(name)
! os.rmdir(test_support.TESTFN)
def check_tempfile(self, name):
***************
*** 37,44 ****
self.check_tempfile(os.tempnam())
! name = os.tempnam(TESTFN)
self.check_tempfile(name)
! name = os.tempnam(TESTFN, "pfx")
self.assert_(os.path.basename(name)[:3] == "pfx")
self.check_tempfile(name)
--- 36,43 ----
self.check_tempfile(os.tempnam())
! name = os.tempnam(test_support.TESTFN)
self.check_tempfile(name)
! name = os.tempnam(test_support.TESTFN, "pfx")
self.assert_(os.path.basename(name)[:3] == "pfx")
self.check_tempfile(name)
***************
*** 85,90 ****
class StatAttributeTests(unittest.TestCase):
def setUp(self):
! os.mkdir(TESTFN)
! self.fname = os.path.join(TESTFN, "f1")
f = open(self.fname, 'wb')
f.write("ABC")
--- 84,89 ----
class StatAttributeTests(unittest.TestCase):
def setUp(self):
! os.mkdir(test_support.TESTFN)
! self.fname = os.path.join(test_support.TESTFN, "f1")
f = open(self.fname, 'wb')
f.write("ABC")
***************
*** 93,97 ****
def tearDown(self):
os.unlink(self.fname)
! os.rmdir(TESTFN)
def test_stat_attributes(self):
--- 92,96 ----
def tearDown(self):
os.unlink(self.fname)
! os.rmdir(test_support.TESTFN)
def test_stat_attributes(self):
***************
*** 239,246 ****
# SUB2/ just a file kid
# tmp3
! sub1_path = join(TESTFN, "SUB1")
sub11_path = join(sub1_path, "SUB11")
! sub2_path = join(TESTFN, "SUB2")
! tmp1_path = join(TESTFN, "tmp1")
tmp2_path = join(sub1_path, "tmp2")
tmp3_path = join(sub2_path, "tmp3")
--- 238,245 ----
# SUB2/ just a file kid
# tmp3
! sub1_path = join(test_support.TESTFN, "SUB1")
sub11_path = join(sub1_path, "SUB11")
! sub2_path = join(test_support.TESTFN, "SUB2")
! tmp1_path = join(test_support.TESTFN, "tmp1")
tmp2_path = join(sub1_path, "tmp2")
tmp3_path = join(sub2_path, "tmp3")
***************
*** 255,259 ****
# Walk top-down.
! all = list(os.walk(TESTFN))
self.assertEqual(len(all), 4)
# We can't know which order SUB1 and SUB2 will appear in.
--- 254,258 ----
# Walk top-down.
! all = list(os.walk(test_support.TESTFN))
self.assertEqual(len(all), 4)
# We can't know which order SUB1 and SUB2 will appear in.
***************
*** 262,266 ****
flipped = all[0][1][0] != "SUB1"
all[0][1].sort()
! self.assertEqual(all[0], (TESTFN, ["SUB1", "SUB2"], ["tmp1"]))
self.assertEqual(all[1 + flipped], (sub1_path, ["SUB11"], ["tmp2"]))
self.assertEqual(all[2 + flipped], (sub11_path, [], []))
--- 261,265 ----
flipped = all[0][1][0] != "SUB1"
all[0][1].sort()
! self.assertEqual(all[0], (test_support.TESTFN, ["SUB1", "SUB2"], ["tmp1"]))
self.assertEqual(all[1 + flipped], (sub1_path, ["SUB11"], ["tmp2"]))
self.assertEqual(all[2 + flipped], (sub11_path, [], []))
***************
*** 269,273 ****
# Prune the search.
all = []
! for root, dirs, files in os.walk(TESTFN):
all.append((root, dirs, files))
# Don't descend into SUB1.
--- 268,272 ----
# Prune the search.
all = []
! for root, dirs, files in os.walk(test_support.TESTFN):
all.append((root, dirs, files))
# Don't descend into SUB1.
***************
*** 276,284 ****
dirs.remove('SUB1')
self.assertEqual(len(all), 2)
! self.assertEqual(all[0], (TESTFN, ["SUB2"], ["tmp1"]))
self.assertEqual(all[1], (sub2_path, [], ["tmp3"]))
# Walk bottom-up.
! all = list(os.walk(TESTFN, topdown=False))
self.assertEqual(len(all), 4)
# We can't know which order SUB1 and SUB2 will appear in.
--- 275,283 ----
dirs.remove('SUB1')
self.assertEqual(len(all), 2)
! self.assertEqual(all[0], (test_support.TESTFN, ["SUB2"], ["tmp1"]))
self.assertEqual(all[1], (sub2_path, [], ["tmp3"]))
# Walk bottom-up.
! all = list(os.walk(test_support.TESTFN, topdown=False))
self.assertEqual(len(all), 4)
# We can't know which order SUB1 and SUB2 will appear in.
***************
*** 287,291 ****
flipped = all[3][1][0] != "SUB1"
all[3][1].sort()
! self.assertEqual(all[3], (TESTFN, ["SUB1", "SUB2"], ["tmp1"]))
self.assertEqual(all[flipped], (sub11_path, [], []))
self.assertEqual(all[flipped + 1], (sub1_path, ["SUB11"], ["tmp2"]))
--- 286,290 ----
flipped = all[3][1][0] != "SUB1"
all[3][1].sort()
! self.assertEqual(all[3], (test_support.TESTFN, ["SUB1", "SUB2"], ["tmp1"]))
self.assertEqual(all[flipped], (sub11_path, [], []))
self.assertEqual(all[flipped + 1], (sub1_path, ["SUB11"], ["tmp2"]))
***************
*** 296,311 ****
# (not so) subtlety is that rmdir will fail unless the dir's
# kids are removed first, so bottom up is essential.
! for root, dirs, files in os.walk(TESTFN, topdown=False):
for name in files:
os.remove(join(root, name))
for name in dirs:
os.rmdir(join(root, name))
! os.rmdir(TESTFN)
def test_main():
! run_classtests(TemporaryFileTests,
! StatAttributeTests,
! EnvironTests,
! WalkTests)
if __name__ == "__main__":
--- 295,312 ----
# (not so) subtlety is that rmdir will fail unless the dir's
# kids are removed first, so bottom up is essential.
! for root, dirs, files in os.walk(test_support.TESTFN, topdown=False):
for name in files:
os.remove(join(root, name))
for name in dirs:
os.rmdir(join(root, name))
! os.rmdir(test_support.TESTFN)
def test_main():
! test_support.run_unittest(
! TemporaryFileTests,
! StatAttributeTests,
! EnvironTests,
! WalkTests
! )
if __name__ == "__main__":
Index: test_parser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_parser.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_parser.py 19 Feb 2003 02:35:06 -0000 1.16
--- test_parser.py 1 May 2003 17:45:44 -0000 1.17
***************
*** 375,383 ****
def test_main():
! loader = unittest.TestLoader()
! suite = unittest.TestSuite()
! suite.addTest(loader.loadTestsFromTestCase(RoundtripLegalSyntaxTestCase))
! suite.addTest(loader.loadTestsFromTestCase(IllegalSyntaxTestCase))
! test_support.run_suite(suite)
--- 375,382 ----
def test_main():
! test_support.run_unittest(
! RoundtripLegalSyntaxTestCase,
! IllegalSyntaxTestCase
! )
Index: test_pep277.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pep277.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_pep277.py 9 Nov 2002 05:26:15 -0000 1.5
--- test_pep277.py 1 May 2003 17:45:44 -0000 1.6
***************
*** 2,8 ****
# open, os.open, os.stat. os.listdir, os.rename, os.remove, os.mkdir, os.chdir, os.rmdir
import os, unittest
! from test.test_support import TESTFN, TestSkipped, TestFailed, run_suite
if not os.path.supports_unicode_filenames:
! raise TestSkipped, "test works only on NT+"
filenames = [
--- 2,8 ----
# open, os.open, os.stat. os.listdir, os.rename, os.remove, os.mkdir, os.chdir, os.rmdir
import os, unittest
! from test import test_support
if not os.path.supports_unicode_filenames:
! raise test_support.TestSkipped, "test works only on NT+"
filenames = [
***************
*** 29,37 ****
class UnicodeFileTests(unittest.TestCase):
! files = [os.path.join(TESTFN, f) for f in filenames]
def setUp(self):
try:
! os.mkdir(TESTFN)
except OSError:
pass
--- 29,37 ----
class UnicodeFileTests(unittest.TestCase):
! files = [os.path.join(test_support.TESTFN, f) for f in filenames]
def setUp(self):
try:
! os.mkdir(test_support.TESTFN)
except OSError:
pass
***************
*** 43,47 ****
def tearDown(self):
! deltree(TESTFN)
def _apply_failure(self, fn, filename, expected_exception,
--- 43,47 ----
def tearDown(self):
! deltree(test_support.TESTFN)
def _apply_failure(self, fn, filename, expected_exception,
***************
*** 49,57 ****
try:
fn(filename)
! raise TestFailed("Expected to fail calling '%s(%r)'"
% (fn.__name__, filename))
except expected_exception, details:
if check_fn_in_exception and details.filename != filename:
! raise TestFailed("Function '%s(%r) failed with "
"bad filename in the exception: %r"
% (fn.__name__, filename,
--- 49,57 ----
try:
fn(filename)
! raise test_support.TestFailed("Expected to fail calling '%s(%r)'"
% (fn.__name__, filename))
except expected_exception, details:
if check_fn_in_exception and details.filename != filename:
! raise test_support.TestFailed("Function '%s(%r) failed with "
"bad filename in the exception: %r"
% (fn.__name__, filename,
***************
*** 78,84 ****
def test_listdir(self):
! f1 = os.listdir(TESTFN)
f1.sort()
! f2 = os.listdir(unicode(TESTFN,"mbcs"))
f2.sort()
print f1
--- 78,84 ----
def test_listdir(self):
! f1 = os.listdir(test_support.TESTFN)
f1.sort()
! f2 = os.listdir(unicode(test_support.TESTFN,"mbcs"))
f2.sort()
print f1
***************
*** 91,95 ****
def test_directory(self):
! dirname = os.path.join(TESTFN,u'Gr\xfc\xdf-\u66e8\u66e9\u66eb')
filename = u'\xdf-\u66e8\u66e9\u66eb'
oldwd = os.getcwd()
--- 91,95 ----
def test_directory(self):
! dirname = os.path.join(test_support.TESTFN,u'Gr\xfc\xdf-\u66e8\u66e9\u66eb')
filename = u'\xdf-\u66e8\u66e9\u66eb'
oldwd = os.getcwd()
***************
*** 105,114 ****
def test_main():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(UnicodeFileTests))
try:
! run_suite(suite)
finally:
! deltree(TESTFN)
if __name__ == "__main__":
--- 105,112 ----
def test_main():
try:
! test_support.run_unittest(UnicodeFileTests)
finally:
! deltree(test_support.TESTFN)
if __name__ == "__main__":
Index: test_pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pickle.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_pickle.py 15 Feb 2003 03:01:09 -0000 1.17
--- test_pickle.py 1 May 2003 17:45:44 -0000 1.18
***************
*** 63,72 ****
def test_main():
! loader = unittest.TestLoader()
! suite = unittest.TestSuite()
! suite.addTest(loader.loadTestsFromTestCase(PickleTests))
! suite.addTest(loader.loadTestsFromTestCase(PicklerTests))
! suite.addTest(loader.loadTestsFromTestCase(PersPicklerTests))
! test_support.run_suite(suite)
test_support.run_doctest(pickle)
--- 63,71 ----
def test_main():
! test_support.run_unittest(
! PickleTests,
! PicklerTests,
! PersPicklerTests
! )
test_support.run_doctest(pickle)
Index: test_posix.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_posix.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_posix.py 18 Mar 2003 13:30:14 -0000 1.5
--- test_posix.py 1 May 2003 17:45:45 -0000 1.6
***************
*** 1,10 ****
"Test posix functions"
! from test.test_support import TestSkipped, TestFailed, TESTFN, run_suite
try:
import posix
except ImportError:
! raise TestSkipped, "posix is not available"
import time
--- 1,10 ----
"Test posix functions"
! from test import test_support
try:
import posix
except ImportError:
! raise test_support.TestSkipped, "posix is not available"
import time
***************
*** 20,28 ****
def setUp(self):
# create empty file
! fp = open(TESTFN, 'w+')
fp.close()
def tearDown(self):
! os.unlink(TESTFN)
def testNoArgFunctions(self):
--- 20,28 ----
def setUp(self):
# create empty file
! fp = open(test_support.TESTFN, 'w+')
fp.close()
def tearDown(self):
! os.unlink(test_support.TESTFN)
def testNoArgFunctions(self):
***************
*** 47,51 ****
def test_fstatvfs(self):
if hasattr(posix, 'fstatvfs'):
! fp = open(TESTFN)
try:
self.assert_(posix.fstatvfs(fp.fileno()))
--- 47,51 ----
def test_fstatvfs(self):
if hasattr(posix, 'fstatvfs'):
! fp = open(test_support.TESTFN)
try:
self.assert_(posix.fstatvfs(fp.fileno()))
***************
*** 55,59 ****
def test_ftruncate(self):
if hasattr(posix, 'ftruncate'):
! fp = open(TESTFN, 'w+')
try:
# we need to have some data to truncate
--- 55,59 ----
def test_ftruncate(self):
if hasattr(posix, 'ftruncate'):
! fp = open(test_support.TESTFN, 'w+')
try:
# we need to have some data to truncate
***************
*** 66,70 ****
def test_dup(self):
if hasattr(posix, 'dup'):
! fp = open(TESTFN)
try:
fd = posix.dup(fp.fileno())
--- 66,70 ----
def test_dup(self):
if hasattr(posix, 'dup'):
! fp = open(test_support.TESTFN)
try:
fd = posix.dup(fp.fileno())
***************
*** 76,81 ****
def test_dup2(self):
if hasattr(posix, 'dup2'):
! fp1 = open(TESTFN)
! fp2 = open(TESTFN)
try:
posix.dup2(fp1.fileno(), fp2.fileno())
--- 76,81 ----
def test_dup2(self):
if hasattr(posix, 'dup2'):
! fp1 = open(test_support.TESTFN)
! fp2 = open(test_support.TESTFN)
try:
posix.dup2(fp1.fileno(), fp2.fileno())
***************
*** 85,89 ****
def fdopen_helper(self, *args):
! fd = os.open(TESTFN, os.O_RDONLY)
fp2 = posix.fdopen(fd, *args)
fp2.close()
--- 85,89 ----
def fdopen_helper(self, *args):
! fd = os.open(test_support.TESTFN, os.O_RDONLY)
fp2 = posix.fdopen(fd, *args)
fp2.close()
***************
*** 97,101 ****
def test_fstat(self):
if hasattr(posix, 'fstat'):
! fp = open(TESTFN)
try:
self.assert_(posix.fstat(fp.fileno()))
--- 97,101 ----
def test_fstat(self):
if hasattr(posix, 'fstat'):
! fp = open(test_support.TESTFN)
try:
self.assert_(posix.fstat(fp.fileno()))
***************
*** 105,122 ****
def test_stat(self):
if hasattr(posix, 'stat'):
! self.assert_(posix.stat(TESTFN))
def test_chdir(self):
if hasattr(posix, 'chdir'):
posix.chdir(os.curdir)
! self.assertRaises(OSError, posix.chdir, TESTFN)
def test_lsdir(self):
if hasattr(posix, 'lsdir'):
! self.assert_(TESTFN in posix.lsdir(os.curdir))
def test_access(self):
if hasattr(posix, 'access'):
! self.assert_(posix.access(TESTFN, os.R_OK))
def test_umask(self):
--- 105,122 ----
def test_stat(self):
if hasattr(posix, 'stat'):
! self.assert_(posix.stat(test_support.TESTFN))
def test_chdir(self):
if hasattr(posix, 'chdir'):
posix.chdir(os.curdir)
! self.assertRaises(OSError, posix.chdir, test_support.TESTFN)
def test_lsdir(self):
if hasattr(posix, 'lsdir'):
! self.assert_(test_support.TESTFN in posix.lsdir(os.curdir))
def test_access(self):
if hasattr(posix, 'access'):
! self.assert_(posix.access(test_support.TESTFN, os.R_OK))
def test_umask(self):
***************
*** 150,160 ****
if hasattr(posix, 'utime'):
now = time.time()
! posix.utime(TESTFN, None)
! posix.utime(TESTFN, (now, now))
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(PosixTester))
! run_suite(suite)
if __name__ == '__main__':
--- 150,158 ----
if hasattr(posix, 'utime'):
now = time.time()
! posix.utime(test_support.TESTFN, None)
! posix.utime(test_support.TESTFN, (now, now))
def test_main():
! test_support.run_unittest(PosixTester)
if __name__ == '__main__':
Index: test_pow.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pow.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_pow.py 3 Feb 2003 20:17:19 -0000 1.17
--- test_pow.py 1 May 2003 17:45:45 -0000 1.18
***************
*** 104,110 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(PowTest))
! test.test_support.run_suite(suite)
if __name__ == "__main__":
--- 104,108 ----
def test_main():
! test.test_support.run_unittest(PowTest)
if __name__ == "__main__":
Index: test_profilehooks.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_profilehooks.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_profilehooks.py 23 Jul 2002 19:03:59 -0000 1.9
--- test_profilehooks.py 1 May 2003 17:45:46 -0000 1.10
***************
*** 350,358 ****
def test_main():
! loader = unittest.TestLoader()
! suite = unittest.TestSuite()
! suite.addTest(loader.loadTestsFromTestCase(ProfileHookTestCase))
! suite.addTest(loader.loadTestsFromTestCase(ProfileSimulatorTestCase))
! test_support.run_suite(suite)
--- 350,357 ----
def test_main():
! test_support.run_unittest(
! ProfileHookTestCase,
! ProfileSimulatorTestCase
! )
Index: test_pwd.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pwd.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_pwd.py 24 Apr 2003 16:02:52 -0000 1.16
--- test_pwd.py 1 May 2003 17:45:46 -0000 1.17
***************
*** 87,93 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(PwdTest))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 87,91 ----
def test_main():
! test_support.run_unittest(PwdTest)
if __name__ == "__main__":
Index: test_re.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_re.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** test_re.py 27 Apr 2003 13:25:20 -0000 1.41
--- test_re.py 1 May 2003 17:45:47 -0000 1.42
***************
*** 2,6 ****
sys.path = ['.'] + sys.path
! from test.test_support import verbose, run_suite
import re
from sre import Scanner
--- 2,6 ----
sys.path = ['.'] + sys.path
! from test.test_support import verbose, run_unittest
import re
from sre import Scanner
***************
*** 433,439 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(ReTests))
! run_suite(suite)
run_re_tests()
--- 433,437 ----
def test_main():
! run_unittest(ReTests)
run_re_tests()
Index: test_richcmp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_richcmp.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_richcmp.py 29 Apr 2003 21:31:18 -0000 1.8
--- test_richcmp.py 1 May 2003 17:45:47 -0000 1.9
***************
*** 353,357 ****
def test_main():
! test_support.run_classtests(VectorTest, NumberTest, MiscTest, DictTest, ListTest)
if __name__ == "__main__":
--- 353,357 ----
def test_main():
! test_support.run_unittest(VectorTest, NumberTest, MiscTest, DictTest, ListTest)
if __name__ == "__main__":
Index: test_sets.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sets.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** test_sets.py 2 Mar 2003 00:36:10 -0000 1.23
--- test_sets.py 1 May 2003 17:45:48 -0000 1.24
***************
*** 659,698 ****
#==============================================================================
- def makeAllTests():
- suite = unittest.TestSuite()
- for klass in (TestSetOfSets,
- TestExceptionPropagation,
- TestBasicOpsEmpty,
- TestBasicOpsSingleton,
- TestBasicOpsTuple,
- TestBasicOpsTriple,
- TestBinaryOps,
- TestUpdateOps,
- TestMutate,
- TestSubsetEqualEmpty,
- TestSubsetEqualNonEmpty,
- TestSubsetEmptyNonEmpty,
- TestSubsetPartial,
- TestSubsetNonOverlap,
- TestOnlySetsNumeric,
- TestOnlySetsDict,
- TestOnlySetsOperator,
- TestCopyingEmpty,
- TestCopyingSingleton,
- TestCopyingTriple,
- TestCopyingTuple,
- TestCopyingNested,
- ):
- suite.addTest(unittest.makeSuite(klass))
- return suite
-
- #------------------------------------------------------------------------------
-
__test__ = {'libreftest' : libreftest}
def test_main(verbose=None):
from test import test_sets
! suite = makeAllTests()
! test_support.run_suite(suite)
test_support.run_doctest(test_sets, verbose)
--- 659,690 ----
#==============================================================================
__test__ = {'libreftest' : libreftest}
def test_main(verbose=None):
from test import test_sets
! test_support.run_unittest(
! TestSetOfSets,
! TestExceptionPropagation,
! TestBasicOpsEmpty,
! TestBasicOpsSingleton,
! TestBasicOpsTuple,
! TestBasicOpsTriple,
! TestBinaryOps,
! TestUpdateOps,
! TestMutate,
! TestSubsetEqualEmpty,
! TestSubsetEqualNonEmpty,
! TestSubsetEmptyNonEmpty,
! TestSubsetPartial,
! TestSubsetNonOverlap,
! TestOnlySetsNumeric,
! TestOnlySetsDict,
! TestOnlySetsOperator,
! TestCopyingEmpty,
! TestCopyingSingleton,
! TestCopyingTriple,
! TestCopyingTuple,
! TestCopyingNested
! )
test_support.run_doctest(test_sets, verbose)
Index: test_shelve.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_shelve.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_shelve.py 19 Apr 2003 20:59:02 -0000 1.4
--- test_shelve.py 1 May 2003 17:45:48 -0000 1.5
***************
*** 122,134 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(TestAsciiFileShelve))
! suite.addTest(unittest.makeSuite(TestBinaryFileShelve))
! suite.addTest(unittest.makeSuite(TestProto2FileShelve))
! suite.addTest(unittest.makeSuite(TestAsciiMemShelve))
! suite.addTest(unittest.makeSuite(TestBinaryMemShelve))
! suite.addTest(unittest.makeSuite(TestProto2MemShelve))
! suite.addTest(unittest.makeSuite(TestCase))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 122,134 ----
def test_main():
! test_support.run_unittest(
! TestAsciiFileShelve,
! TestBinaryFileShelve,
! TestProto2FileShelve,
! TestAsciiMemShelve,
! TestBinaryMemShelve,
! TestProto2MemShelve,
! TestCase
! )
if __name__ == "__main__":
Index: test_shutil.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_shutil.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_shutil.py 24 Jan 2003 17:34:13 -0000 1.1
--- test_shutil.py 1 May 2003 17:45:49 -0000 1.2
***************
*** 15,28 ****
- def suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestShutil))
- return suite
-
-
def test_main():
! test_support.run_suite(suite())
if __name__ == '__main__':
! unittest.main(defaultTest='suite')
--- 15,22 ----
def test_main():
! test_support.run_unittest(TestShutil)
if __name__ == '__main__':
! test_main()
Index: test_socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** test_socket.py 25 Apr 2003 15:11:23 -0000 1.63
--- test_socket.py 1 May 2003 17:45:49 -0000 1.64
***************
*** 684,698 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(GeneralModuleTests))
! suite.addTest(unittest.makeSuite(BasicTCPTest))
if sys.platform != 'mac':
! suite.addTest(unittest.makeSuite(BasicUDPTest))
! suite.addTest(unittest.makeSuite(NonBlockingTCPTests))
! suite.addTest(unittest.makeSuite(FileObjectClassTestCase))
! suite.addTest(unittest.makeSuite(UnbufferedFileObjectClassTestCase))
! suite.addTest(unittest.makeSuite(LineBufferedFileObjectClassTestCase))
! suite.addTest(unittest.makeSuite(SmallBufferedFileObjectClassTestCase))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 684,699 ----
def test_main():
! tests = [ GeneralModuleTests, BasicTCPTest ]
if sys.platform != 'mac':
! tests.append(BasicUDPTest)
!
! tests.extend([
! NonBlockingTCPTests,
! FileObjectClassTestCase,
! UnbufferedFileObjectClassTestCase,
! LineBufferedFileObjectClassTestCase,
! SmallBufferedFileObjectClassTestCase
! ])
! test_support.run_unittest(*tests)
if __name__ == "__main__":
Index: test_str.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_str.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_str.py 31 Mar 2003 18:07:49 -0000 1.2
--- test_str.py 1 May 2003 17:45:50 -0000 1.3
***************
*** 20,26 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(StrTest))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 20,24 ----
def test_main():
! test_support.run_unittest(StrTest)
if __name__ == "__main__":
Index: test_string.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_string.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** test_string.py 21 Feb 2003 12:53:49 -0000 1.24
--- test_string.py 1 May 2003 17:45:50 -0000 1.25
***************
*** 96,103 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(StringTest))
! suite.addTest(unittest.makeSuite(ModuleTest))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 96,100 ----
def test_main():
! test_support.run_unittest(StringTest, ModuleTest)
if __name__ == "__main__":
Index: test_strptime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strptime.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** test_strptime.py 28 Apr 2003 21:30:13 -0000 1.12
--- test_strptime.py 1 May 2003 17:45:50 -0000 1.13
***************
*** 407,418 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(LocaleTime_Tests))
! suite.addTest(unittest.makeSuite(TimeRETests))
! suite.addTest(unittest.makeSuite(StrptimeTests))
! suite.addTest(unittest.makeSuite(Strptime12AMPMTests))
! suite.addTest(unittest.makeSuite(JulianTests))
! suite.addTest(unittest.makeSuite(CalculationTests))
! test_support.run_suite(suite)
--- 407,418 ----
def test_main():
! test_support.run_unittest(
! LocaleTime_Tests,
! TimeRETests,
! StrptimeTests,
! Strptime12AMPMTests,
! JulianTests,
! CalculationTests
! )
Index: test_support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** test_support.py 27 Apr 2003 07:54:23 -0000 1.51
--- test_support.py 1 May 2003 17:45:51 -0000 1.52
***************
*** 230,242 ****
! def run_unittest(testclass):
! """Run tests from a unittest.TestCase-derived class."""
! run_suite(unittest.makeSuite(testclass), testclass)
!
! def run_classtests(*classnames):
suite = unittest.TestSuite()
! for cls in classnames:
suite.addTest(unittest.makeSuite(cls))
! run_suite(suite)
--- 230,243 ----
! def run_unittest(*classes):
! """Run tests from unittest.TestCase-derived classes."""
suite = unittest.TestSuite()
! for cls in classes:
suite.addTest(unittest.makeSuite(cls))
! if len(classes)==1:
! testclass = classes[0]
! else:
! testclass = None
! run_suite(suite, testclass)
Index: test_sys.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sys.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_sys.py 1 Mar 2003 03:25:41 -0000 1.6
--- test_sys.py 1 May 2003 17:45:51 -0000 1.7
***************
*** 248,254 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(SysModuleTest))
! test.test_support.run_suite(suite)
if __name__ == "__main__":
--- 248,252 ----
def test_main():
! test.test_support.run_unittest(SysModuleTest)
if __name__ == "__main__":
Index: test_tarfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tarfile.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_tarfile.py 14 Apr 2003 01:18:32 -0000 1.7
--- test_tarfile.py 1 May 2003 17:45:51 -0000 1.8
***************
*** 241,265 ****
bz2.BZ2File(tarname("bz2"), "wb").write(file(tarname(), "rb").read())
! try:
! suite = unittest.TestSuite()
!
! suite.addTest(unittest.makeSuite(ReadTest))
! suite.addTest(unittest.makeSuite(ReadStreamTest))
! suite.addTest(unittest.makeSuite(WriteTest))
! suite.addTest(unittest.makeSuite(WriteStreamTest))
!
! if gzip:
! suite.addTest(unittest.makeSuite(ReadTestGzip))
! suite.addTest(unittest.makeSuite(ReadStreamTestGzip))
! suite.addTest(unittest.makeSuite(WriteTestGzip))
! suite.addTest(unittest.makeSuite(WriteStreamTestGzip))
! if bz2:
! suite.addTest(unittest.makeSuite(ReadTestBzip2))
! suite.addTest(unittest.makeSuite(ReadStreamTestBzip2))
! suite.addTest(unittest.makeSuite(WriteTestBzip2))
! suite.addTest(unittest.makeSuite(WriteStreamTestBzip2))
! test_support.run_suite(suite)
finally:
if gzip:
--- 241,264 ----
bz2.BZ2File(tarname("bz2"), "wb").write(file(tarname(), "rb").read())
! tests = [
! ReadTest,
! ReadStreamTest,
! WriteTest,
! WriteStreamTest
! ]
! if gzip:
! tests.extend([
! ReadTestGzip, ReadStreamTestGzip,
! WriteTestGzip, WriteStreamTestGzip
! ])
! if bz2:
! tests.extend([
! ReadTestBzip2, ReadStreamTestBzip2,
! WriteTestBzip2, WriteStreamTestBzip2
! ])
! try:
! test_support.run_unittest(*tests)
finally:
if gzip:
Index: test_tempfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tempfile.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_tempfile.py 8 Jan 2003 16:30:34 -0000 1.13
--- test_tempfile.py 1 May 2003 17:45:51 -0000 1.14
***************
*** 646,653 ****
def test_main():
! suite = unittest.TestSuite()
! for c in test_classes:
! suite.addTest(unittest.makeSuite(c))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 646,650 ----
def test_main():
! test_support.run_unittest(*test_classes)
if __name__ == "__main__":
Index: test_textwrap.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_textwrap.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** test_textwrap.py 9 Dec 2002 16:32:41 -0000 1.18
--- test_textwrap.py 1 May 2003 17:45:51 -0000 1.19
***************
*** 353,361 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(WrapTestCase))
! suite.addTest(unittest.makeSuite(LongWordTestCase))
! suite.addTest(unittest.makeSuite(IndentTestCases))
! test_support.run_suite(suite)
if __name__ == '__main__':
--- 353,357 ----
def test_main():
! test_support.run_unittest(WrapTestCase, LongWordTestCase, IndentTestCases)
if __name__ == '__main__':
Index: test_timeout.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_timeout.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_timeout.py 11 Apr 2003 15:14:05 -0000 1.13
--- test_timeout.py 1 May 2003 17:45:51 -0000 1.14
***************
*** 187,194 ****
def test_main():
test_support.requires('network')
!
! suite = unittest.makeSuite(CreationTestCase)
! suite.addTest(unittest.makeSuite(TimeoutTestCase))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 187,191 ----
def test_main():
test_support.requires('network')
! test_support.run_unittest(CreationTestCase, TimeoutTestCase)
if __name__ == "__main__":
Index: test_trace.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_trace.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_trace.py 29 Apr 2003 16:18:47 -0000 1.8
--- test_trace.py 1 May 2003 17:45:52 -0000 1.9
***************
*** 532,538 ****
def test_main():
! test_support.run_unittest(TraceTestCase)
! test_support.run_unittest(RaisingTraceFuncTestCase)
! test_support.run_unittest(JumpTestCase)
if __name__ == "__main__":
--- 532,540 ----
def test_main():
! test_support.run_unittest(
! TraceTestCase,
! RaisingTraceFuncTestCase,
! JumpTestCase
! )
if __name__ == "__main__":
Index: test_ucn.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_ucn.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_ucn.py 7 Mar 2003 17:30:48 -0000 1.13
--- test_ucn.py 1 May 2003 17:45:52 -0000 1.14
***************
*** 139,145 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(UnicodeNamesTest))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 139,143 ----
def test_main():
! test_support.run_unittest(UnicodeNamesTest)
if __name__ == "__main__":
Index: test_unicode.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** test_unicode.py 2 Apr 2003 16:37:24 -0000 1.82
--- test_unicode.py 1 May 2003 17:45:53 -0000 1.83
***************
*** 699,705 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(UnicodeTest))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 699,703 ----
def test_main():
! test_support.run_unittest(UnicodeTest)
if __name__ == "__main__":
Index: test_unicodedata.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicodedata.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_unicodedata.py 7 Mar 2003 17:30:48 -0000 1.8
--- test_unicodedata.py 1 May 2003 17:45:53 -0000 1.9
***************
*** 204,212 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(UnicodeMiscTest))
! suite.addTest(unittest.makeSuite(UnicodeMethodsTest))
! suite.addTest(unittest.makeSuite(UnicodeFunctionsTest))
! test.test_support.run_suite(suite)
if __name__ == "__main__":
--- 204,212 ----
def test_main():
! test.test_support.run_unittest(
! UnicodeMiscTest,
! UnicodeMethodsTest,
! UnicodeFunctionsTest
! )
if __name__ == "__main__":
Index: test_univnewlines.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_univnewlines.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_univnewlines.py 23 Jul 2002 19:04:08 -0000 1.4
--- test_univnewlines.py 1 May 2003 17:45:53 -0000 1.5
***************
*** 112,120 ****
def test_main():
! test_support.run_unittest(TestNativeNewlines)
! test_support.run_unittest(TestCRNewlines)
! test_support.run_unittest(TestLFNewlines)
! test_support.run_unittest(TestCRLFNewlines)
! test_support.run_unittest(TestMixedNewlines)
if __name__ == '__main__':
--- 112,122 ----
def test_main():
! test_support.run_unittest(
! TestNativeNewlines,
! TestCRNewlines,
! TestLFNewlines,
! TestCRLFNewlines,
! TestMixedNewlines
! )
if __name__ == '__main__':
Index: test_urllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urllib.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** test_urllib.py 29 Apr 2003 05:08:06 -0000 1.12
--- test_urllib.py 1 May 2003 17:45:53 -0000 1.13
***************
*** 409,420 ****
def test_main():
! test_suite = unittest.TestSuite()
! test_suite.addTest(unittest.makeSuite(urlopen_FileTests))
! test_suite.addTest(unittest.makeSuite(urlretrieve_FileTests))
! test_suite.addTest(unittest.makeSuite(QuotingTests))
! test_suite.addTest(unittest.makeSuite(UnquotingTests))
! test_suite.addTest(unittest.makeSuite(urlencode_Tests))
! test_suite.addTest(unittest.makeSuite(Pathname_Tests))
! test_support.run_suite(test_suite)
--- 409,420 ----
def test_main():
! test_support.run_unittest(
! urlopen_FileTests,
! urlretrieve_FileTests,
! QuotingTests,
! UnquotingTests,
! urlencode_Tests,
! Pathname_Tests
! )
Index: test_urllibnet.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urllibnet.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_urllibnet.py 30 Mar 2003 04:54:24 -0000 1.1
--- test_urllibnet.py 1 May 2003 17:45:54 -0000 1.2
***************
*** 24,31 ****
def test_main():
test_support.requires('network')
!
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(URLTimeoutTest))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 24,28 ----
def test_main():
test_support.requires('network')
! test_support.run_unittest(URLTimeoutTest)
if __name__ == "__main__":
Index: test_userdict.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userdict.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_userdict.py 9 Mar 2003 07:05:14 -0000 1.14
--- test_userdict.py 1 May 2003 17:45:54 -0000 1.15
***************
*** 396,404 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(TestMappingProtocol))
! suite.addTest(unittest.makeSuite(UserDictTest))
! suite.addTest(unittest.makeSuite(UserDictMixinTest))
! test.test_support.run_suite(suite)
if __name__ == "__main__":
--- 396,404 ----
def test_main():
! test.test_support.run_unittest(
! TestMappingProtocol,
! UserDictTest,
! UserDictMixinTest
! )
if __name__ == "__main__":
Index: test_userlist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userlist.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_userlist.py 19 Feb 2003 02:35:06 -0000 1.8
--- test_userlist.py 1 May 2003 17:45:54 -0000 1.9
***************
*** 253,259 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(UserListTest))
! test.test_support.run_suite(suite)
if __name__ == "__main__":
--- 253,257 ----
def test_main():
! test.test_support.run_unittest(UserListTest)
if __name__ == "__main__":
Index: test_userstring.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userstring.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_userstring.py 21 Feb 2003 12:53:49 -0000 1.10
--- test_userstring.py 1 May 2003 17:45:55 -0000 1.11
***************
*** 45,51 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(UserStringTest))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 45,49 ----
def test_main():
! test_support.run_unittest(UserStringTest)
if __name__ == "__main__":
Index: test_weakref.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_weakref.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** test_weakref.py 9 Mar 2003 07:05:14 -0000 1.22
--- test_weakref.py 1 May 2003 17:45:55 -0000 1.23
***************
*** 535,544 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(ReferencesTestCase))
! suite.addTest(unittest.makeSuite(MappingTestCase))
! suite.addTest(unittest.makeSuite(WeakValueDictionaryTestCase))
! suite.addTest(unittest.makeSuite(WeakKeyDictionaryTestCase))
! test_support.run_suite(suite)
--- 535,544 ----
def test_main():
! test_support.run_unittest(
! ReferencesTestCase,
! MappingTestCase,
! WeakValueDictionaryTestCase,
! WeakKeyDictionaryTestCase
! )
Index: test_xpickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_xpickle.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_xpickle.py 19 Feb 2003 02:35:06 -0000 1.3
--- test_xpickle.py 1 May 2003 17:45:56 -0000 1.4
***************
*** 36,45 ****
def test_main():
! suite = unittest.TestSuite()
! for test in (DumpCPickle_LoadPickle,
! DumpPickle_LoadCPickle,
! ):
! suite.addTest(unittest.makeSuite(test))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 36,43 ----
def test_main():
! test_support.run_unittest(
! DumpCPickle_LoadPickle,
! DumpPickle_LoadCPickle
! )
if __name__ == "__main__":
Index: test_zipimport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zipimport.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_zipimport.py 19 Feb 2003 02:35:06 -0000 1.7
--- test_zipimport.py 1 May 2003 17:45:56 -0000 1.8
***************
*** 188,193 ****
def test_main():
! test_support.run_unittest(UncompressedZipImportTestCase)
! test_support.run_unittest(CompressedZipImportTestCase)
if __name__ == "__main__":
--- 188,195 ----
def test_main():
! test_support.run_unittest(
! UncompressedZipImportTestCase,
! CompressedZipImportTestCase
! )
if __name__ == "__main__":
Index: test_zlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zlib.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** test_zlib.py 27 Feb 2003 18:39:18 -0000 1.22
--- test_zlib.py 1 May 2003 17:45:56 -0000 1.23
***************
*** 480,489 ****
def test_main():
! suite = unittest.TestSuite()
! suite.addTest(unittest.makeSuite(ChecksumTestCase))
! suite.addTest(unittest.makeSuite(ExceptionTestCase))
! suite.addTest(unittest.makeSuite(CompressTestCase))
! suite.addTest(unittest.makeSuite(CompressObjectTestCase))
! test_support.run_suite(suite)
if __name__ == "__main__":
--- 480,489 ----
def test_main():
! test_support.run_unittest(
! ChecksumTestCase,
! ExceptionTestCase,
! CompressTestCase,
! CompressObjectTestCase
! )
if __name__ == "__main__":
***************
*** 492,501 ****
def test(tests=''):
if not tests: tests = 'o'
! suite = unittest.TestSuite()
! if 'k' in tests: suite.addTest(unittest.makeSuite(ChecksumTestCase))
! if 'x' in tests: suite.addTest(unittest.makeSuite(ExceptionTestCase))
! if 'c' in tests: suite.addTest(unittest.makeSuite(CompressTestCase))
! if 'o' in tests: suite.addTest(unittest.makeSuite(CompressObjectTestCase))
! test_support.run_suite(suite)
if False:
--- 492,501 ----
def test(tests=''):
if not tests: tests = 'o'
! testcases = []
! if 'k' in tests: testcases.append(ChecksumTestCase)
! if 'x' in tests: testcases.append(ExceptionTestCase)
! if 'c' in tests: testcases.append(CompressTestCase)
! if 'o' in tests: testcases.append(CompressObjectTestCase)
! test_support.run_unittest(*testcases)
if False: