changeset: 91515:27feb652d3ad branch: 3.4 parent: 91513:b836a0cd68f7 user: Zachary Ware date: Tue Jul 01 19:55:04 2014 -0500 files: Lib/test/multibytecodec_support.py Lib/test/test_codecmaps_cn.py Lib/test/test_codecmaps_hk.py Lib/test/test_codecmaps_jp.py Lib/test/test_codecmaps_kr.py Lib/test/test_codecmaps_tw.py description: Issue #18258: Fix test discovery for test_codecmaps_*. diff -r b836a0cd68f7 -r 27feb652d3ad Lib/test/multibytecodec_support.py --- a/Lib/test/multibytecodec_support.py Tue Jul 01 18:52:37 2014 -0400 +++ b/Lib/test/multibytecodec_support.py Tue Jul 01 19:55:04 2014 -0500 @@ -277,8 +277,7 @@ supmaps = [] codectests = [] - def __init__(self, *args, **kw): - unittest.TestCase.__init__(self, *args, **kw) + def setUp(self): try: self.open_mapping_file().close() # test it to report the error early except (OSError, HTTPException): diff -r b836a0cd68f7 -r 27feb652d3ad Lib/test/test_codecmaps_cn.py --- a/Lib/test/test_codecmaps_cn.py Tue Jul 01 18:52:37 2014 -0400 +++ b/Lib/test/test_codecmaps_cn.py Tue Jul 01 19:55:04 2014 -0500 @@ -25,8 +25,5 @@ 'trunk/charset/data/xml/gb-18030-2000.xml' -def test_main(): - support.run_unittest(__name__) - if __name__ == "__main__": - test_main() + unittest.main() diff -r b836a0cd68f7 -r 27feb652d3ad Lib/test/test_codecmaps_hk.py --- a/Lib/test/test_codecmaps_hk.py Tue Jul 01 18:52:37 2014 -0400 +++ b/Lib/test/test_codecmaps_hk.py Tue Jul 01 19:55:04 2014 -0500 @@ -12,8 +12,5 @@ encoding = 'big5hkscs' mapfileurl = 'http://people.freebsd.org/~perky/i18n/BIG5HKSCS-2004.TXT' -def test_main(): - support.run_unittest(__name__) - if __name__ == "__main__": - test_main() + unittest.main() diff -r b836a0cd68f7 -r 27feb652d3ad Lib/test/test_codecmaps_jp.py --- a/Lib/test/test_codecmaps_jp.py Tue Jul 01 18:52:37 2014 -0400 +++ b/Lib/test/test_codecmaps_jp.py Tue Jul 01 19:55:04 2014 -0500 @@ -59,8 +59,5 @@ mapfileurl = 'http://people.freebsd.org/~perky/i18n/SHIFT_JISX0213.TXT' -def test_main(): - support.run_unittest(__name__) - if __name__ == "__main__": - test_main() + unittest.main() diff -r b836a0cd68f7 -r 27feb652d3ad Lib/test/test_codecmaps_kr.py --- a/Lib/test/test_codecmaps_kr.py Tue Jul 01 18:52:37 2014 -0400 +++ b/Lib/test/test_codecmaps_kr.py Tue Jul 01 19:55:04 2014 -0500 @@ -36,8 +36,5 @@ pass_enctest = [(b'\\', '\u20a9')] pass_dectest = [(b'\\', '\u20a9')] -def test_main(): - support.run_unittest(__name__) - if __name__ == "__main__": - test_main() + unittest.main() diff -r b836a0cd68f7 -r 27feb652d3ad Lib/test/test_codecmaps_tw.py --- a/Lib/test/test_codecmaps_tw.py Tue Jul 01 18:52:37 2014 -0400 +++ b/Lib/test/test_codecmaps_tw.py Tue Jul 01 19:55:04 2014 -0500 @@ -26,8 +26,5 @@ (b"\xFFxy", "replace", "\ufffdxy"), ) -def test_main(): - support.run_unittest(__name__) - if __name__ == "__main__": - test_main() + unittest.main()