[Python-checkins] cpython: Correctly move email package tests to Lib/test. (original) (raw)
r.david.murray python-checkins at python.org
Mon Mar 21 22:29:13 CET 2011
- Previous message: [Python-checkins] cpython: Move email tests to Lib/test package and modernize test runner machinery
- Next message: [Python-checkins] cpython (merge default -> default): Dummy merge to overlay fixed email.test move on top of borked move.
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
http://hg.python.org/cpython/rev/0d8afab5249f changeset: 68819:0d8afab5249f parent: 68817:7d5d859c959e user: R David Murray <rdmurray at bitdance.com> date: Mon Mar 21 17:17:06 2011 -0400 summary: Correctly move email package tests to Lib/test.
files: Lib/email/test/init.py Lib/email/test/data/PyBanner048.gif Lib/email/test/data/audiotest.au Lib/email/test/data/msg_01.txt Lib/email/test/data/msg_02.txt Lib/email/test/data/msg_03.txt Lib/email/test/data/msg_04.txt Lib/email/test/data/msg_05.txt Lib/email/test/data/msg_06.txt Lib/email/test/data/msg_07.txt Lib/email/test/data/msg_08.txt Lib/email/test/data/msg_09.txt Lib/email/test/data/msg_10.txt Lib/email/test/data/msg_11.txt Lib/email/test/data/msg_12.txt Lib/email/test/data/msg_12a.txt Lib/email/test/data/msg_13.txt Lib/email/test/data/msg_14.txt Lib/email/test/data/msg_15.txt Lib/email/test/data/msg_16.txt Lib/email/test/data/msg_17.txt Lib/email/test/data/msg_18.txt Lib/email/test/data/msg_19.txt Lib/email/test/data/msg_20.txt Lib/email/test/data/msg_21.txt Lib/email/test/data/msg_22.txt Lib/email/test/data/msg_23.txt Lib/email/test/data/msg_24.txt Lib/email/test/data/msg_25.txt Lib/email/test/data/msg_26.txt Lib/email/test/data/msg_27.txt Lib/email/test/data/msg_28.txt Lib/email/test/data/msg_29.txt Lib/email/test/data/msg_30.txt Lib/email/test/data/msg_31.txt Lib/email/test/data/msg_32.txt Lib/email/test/data/msg_33.txt Lib/email/test/data/msg_34.txt Lib/email/test/data/msg_35.txt Lib/email/test/data/msg_36.txt Lib/email/test/data/msg_37.txt Lib/email/test/data/msg_38.txt Lib/email/test/data/msg_39.txt Lib/email/test/data/msg_40.txt Lib/email/test/data/msg_41.txt Lib/email/test/data/msg_42.txt Lib/email/test/data/msg_43.txt Lib/email/test/data/msg_44.txt Lib/email/test/data/msg_45.txt Lib/email/test/data/msg_46.txt Lib/email/test/test_email.py Lib/email/test/test_email_codecs.py Lib/email/test/test_email_torture.py Lib/test/test_email.py Lib/test/test_email/init.py Lib/test/test_email/data/PyBanner048.gif Lib/test/test_email/data/audiotest.au Lib/test/test_email/data/msg_01.txt Lib/test/test_email/data/msg_02.txt Lib/test/test_email/data/msg_03.txt Lib/test/test_email/data/msg_04.txt Lib/test/test_email/data/msg_05.txt Lib/test/test_email/data/msg_06.txt Lib/test/test_email/data/msg_07.txt Lib/test/test_email/data/msg_08.txt Lib/test/test_email/data/msg_09.txt Lib/test/test_email/data/msg_10.txt Lib/test/test_email/data/msg_11.txt Lib/test/test_email/data/msg_12.txt Lib/test/test_email/data/msg_12a.txt Lib/test/test_email/data/msg_13.txt Lib/test/test_email/data/msg_14.txt Lib/test/test_email/data/msg_15.txt Lib/test/test_email/data/msg_16.txt Lib/test/test_email/data/msg_17.txt Lib/test/test_email/data/msg_18.txt Lib/test/test_email/data/msg_19.txt Lib/test/test_email/data/msg_20.txt Lib/test/test_email/data/msg_21.txt Lib/test/test_email/data/msg_22.txt Lib/test/test_email/data/msg_23.txt Lib/test/test_email/data/msg_24.txt Lib/test/test_email/data/msg_25.txt Lib/test/test_email/data/msg_26.txt Lib/test/test_email/data/msg_27.txt Lib/test/test_email/data/msg_28.txt Lib/test/test_email/data/msg_29.txt Lib/test/test_email/data/msg_30.txt Lib/test/test_email/data/msg_31.txt Lib/test/test_email/data/msg_32.txt Lib/test/test_email/data/msg_33.txt Lib/test/test_email/data/msg_34.txt Lib/test/test_email/data/msg_35.txt Lib/test/test_email/data/msg_36.txt Lib/test/test_email/data/msg_37.txt Lib/test/test_email/data/msg_38.txt Lib/test/test_email/data/msg_39.txt Lib/test/test_email/data/msg_40.txt Lib/test/test_email/data/msg_41.txt Lib/test/test_email/data/msg_42.txt Lib/test/test_email/data/msg_43.txt Lib/test/test_email/data/msg_44.txt Lib/test/test_email/data/msg_45.txt Lib/test/test_email/data/msg_46.txt Lib/test/test_email/test_asian_codecs.py Lib/test/test_email/test_email.py Lib/test/test_email/tourture_test.py Misc/NEWS
diff --git a/Lib/test/test_email.py b/Lib/test/test_email.py deleted file mode 100644 --- a/Lib/test/test_email.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2001-2007 Python Software Foundation -# email package unit tests
-# The specific tests now live in Lib/email/test -from email.test.test_email import suite -from email.test.test_email_codecs import suite as codecs_suite -from test import support
-def test_main(): - support.run_unittest(suite()) - support.run_unittest(codecs_suite())
-if name == 'main': - test_main() diff --git a/Lib/email/test/init.py b/Lib/test/test_email/init.py rename from Lib/email/test/init.py rename to Lib/test/test_email/init.py --- a/Lib/email/test/init.py +++ b/Lib/test/test_email/init.py @@ -0,0 +1,13 @@ +import os +import sys +import unittest +import test.support + +# used by regrtest and main. +def test_main(): + here = os.path.dirname(file) + # Unittest mucks with the path, so we have to save and restore + # it to keep regrtest happy. + savepath = sys.path[:] + test.support._run_suite(unittest.defaultTestLoader.discover(here)) + sys.path[:] = savepath diff --git a/Lib/email/test/data/PyBanner048.gif b/Lib/test/test_email/data/PyBanner048.gif rename from Lib/email/test/data/PyBanner048.gif rename to Lib/test/test_email/data/PyBanner048.gif diff --git a/Lib/email/test/data/audiotest.au b/Lib/test/test_email/data/audiotest.au rename from Lib/email/test/data/audiotest.au rename to Lib/test/test_email/data/audiotest.au diff --git a/Lib/email/test/data/msg_01.txt b/Lib/test/test_email/data/msg_01.txt rename from Lib/email/test/data/msg_01.txt rename to Lib/test/test_email/data/msg_01.txt diff --git a/Lib/email/test/data/msg_02.txt b/Lib/test/test_email/data/msg_02.txt rename from Lib/email/test/data/msg_02.txt rename to Lib/test/test_email/data/msg_02.txt diff --git a/Lib/email/test/data/msg_03.txt b/Lib/test/test_email/data/msg_03.txt rename from Lib/email/test/data/msg_03.txt rename to Lib/test/test_email/data/msg_03.txt diff --git a/Lib/email/test/data/msg_04.txt b/Lib/test/test_email/data/msg_04.txt rename from Lib/email/test/data/msg_04.txt rename to Lib/test/test_email/data/msg_04.txt diff --git a/Lib/email/test/data/msg_05.txt b/Lib/test/test_email/data/msg_05.txt rename from Lib/email/test/data/msg_05.txt rename to Lib/test/test_email/data/msg_05.txt diff --git a/Lib/email/test/data/msg_06.txt b/Lib/test/test_email/data/msg_06.txt rename from Lib/email/test/data/msg_06.txt rename to Lib/test/test_email/data/msg_06.txt diff --git a/Lib/email/test/data/msg_07.txt b/Lib/test/test_email/data/msg_07.txt rename from Lib/email/test/data/msg_07.txt rename to Lib/test/test_email/data/msg_07.txt diff --git a/Lib/email/test/data/msg_08.txt b/Lib/test/test_email/data/msg_08.txt rename from Lib/email/test/data/msg_08.txt rename to Lib/test/test_email/data/msg_08.txt diff --git a/Lib/email/test/data/msg_09.txt b/Lib/test/test_email/data/msg_09.txt rename from Lib/email/test/data/msg_09.txt rename to Lib/test/test_email/data/msg_09.txt diff --git a/Lib/email/test/data/msg_10.txt b/Lib/test/test_email/data/msg_10.txt rename from Lib/email/test/data/msg_10.txt rename to Lib/test/test_email/data/msg_10.txt diff --git a/Lib/email/test/data/msg_11.txt b/Lib/test/test_email/data/msg_11.txt rename from Lib/email/test/data/msg_11.txt rename to Lib/test/test_email/data/msg_11.txt diff --git a/Lib/email/test/data/msg_12.txt b/Lib/test/test_email/data/msg_12.txt rename from Lib/email/test/data/msg_12.txt rename to Lib/test/test_email/data/msg_12.txt diff --git a/Lib/email/test/data/msg_12a.txt b/Lib/test/test_email/data/msg_12a.txt rename from Lib/email/test/data/msg_12a.txt rename to Lib/test/test_email/data/msg_12a.txt diff --git a/Lib/email/test/data/msg_13.txt b/Lib/test/test_email/data/msg_13.txt rename from Lib/email/test/data/msg_13.txt rename to Lib/test/test_email/data/msg_13.txt diff --git a/Lib/email/test/data/msg_14.txt b/Lib/test/test_email/data/msg_14.txt rename from Lib/email/test/data/msg_14.txt rename to Lib/test/test_email/data/msg_14.txt diff --git a/Lib/email/test/data/msg_15.txt b/Lib/test/test_email/data/msg_15.txt rename from Lib/email/test/data/msg_15.txt rename to Lib/test/test_email/data/msg_15.txt diff --git a/Lib/email/test/data/msg_16.txt b/Lib/test/test_email/data/msg_16.txt rename from Lib/email/test/data/msg_16.txt rename to Lib/test/test_email/data/msg_16.txt diff --git a/Lib/email/test/data/msg_17.txt b/Lib/test/test_email/data/msg_17.txt rename from Lib/email/test/data/msg_17.txt rename to Lib/test/test_email/data/msg_17.txt diff --git a/Lib/email/test/data/msg_18.txt b/Lib/test/test_email/data/msg_18.txt rename from Lib/email/test/data/msg_18.txt rename to Lib/test/test_email/data/msg_18.txt diff --git a/Lib/email/test/data/msg_19.txt b/Lib/test/test_email/data/msg_19.txt rename from Lib/email/test/data/msg_19.txt rename to Lib/test/test_email/data/msg_19.txt diff --git a/Lib/email/test/data/msg_20.txt b/Lib/test/test_email/data/msg_20.txt rename from Lib/email/test/data/msg_20.txt rename to Lib/test/test_email/data/msg_20.txt diff --git a/Lib/email/test/data/msg_21.txt b/Lib/test/test_email/data/msg_21.txt rename from Lib/email/test/data/msg_21.txt rename to Lib/test/test_email/data/msg_21.txt diff --git a/Lib/email/test/data/msg_22.txt b/Lib/test/test_email/data/msg_22.txt rename from Lib/email/test/data/msg_22.txt rename to Lib/test/test_email/data/msg_22.txt diff --git a/Lib/email/test/data/msg_23.txt b/Lib/test/test_email/data/msg_23.txt rename from Lib/email/test/data/msg_23.txt rename to Lib/test/test_email/data/msg_23.txt diff --git a/Lib/email/test/data/msg_24.txt b/Lib/test/test_email/data/msg_24.txt rename from Lib/email/test/data/msg_24.txt rename to Lib/test/test_email/data/msg_24.txt diff --git a/Lib/email/test/data/msg_25.txt b/Lib/test/test_email/data/msg_25.txt rename from Lib/email/test/data/msg_25.txt rename to Lib/test/test_email/data/msg_25.txt diff --git a/Lib/email/test/data/msg_26.txt b/Lib/test/test_email/data/msg_26.txt rename from Lib/email/test/data/msg_26.txt rename to Lib/test/test_email/data/msg_26.txt diff --git a/Lib/email/test/data/msg_27.txt b/Lib/test/test_email/data/msg_27.txt rename from Lib/email/test/data/msg_27.txt rename to Lib/test/test_email/data/msg_27.txt diff --git a/Lib/email/test/data/msg_28.txt b/Lib/test/test_email/data/msg_28.txt rename from Lib/email/test/data/msg_28.txt rename to Lib/test/test_email/data/msg_28.txt diff --git a/Lib/email/test/data/msg_29.txt b/Lib/test/test_email/data/msg_29.txt rename from Lib/email/test/data/msg_29.txt rename to Lib/test/test_email/data/msg_29.txt diff --git a/Lib/email/test/data/msg_30.txt b/Lib/test/test_email/data/msg_30.txt rename from Lib/email/test/data/msg_30.txt rename to Lib/test/test_email/data/msg_30.txt diff --git a/Lib/email/test/data/msg_31.txt b/Lib/test/test_email/data/msg_31.txt rename from Lib/email/test/data/msg_31.txt rename to Lib/test/test_email/data/msg_31.txt diff --git a/Lib/email/test/data/msg_32.txt b/Lib/test/test_email/data/msg_32.txt rename from Lib/email/test/data/msg_32.txt rename to Lib/test/test_email/data/msg_32.txt diff --git a/Lib/email/test/data/msg_33.txt b/Lib/test/test_email/data/msg_33.txt rename from Lib/email/test/data/msg_33.txt rename to Lib/test/test_email/data/msg_33.txt diff --git a/Lib/email/test/data/msg_34.txt b/Lib/test/test_email/data/msg_34.txt rename from Lib/email/test/data/msg_34.txt rename to Lib/test/test_email/data/msg_34.txt diff --git a/Lib/email/test/data/msg_35.txt b/Lib/test/test_email/data/msg_35.txt rename from Lib/email/test/data/msg_35.txt rename to Lib/test/test_email/data/msg_35.txt diff --git a/Lib/email/test/data/msg_36.txt b/Lib/test/test_email/data/msg_36.txt rename from Lib/email/test/data/msg_36.txt rename to Lib/test/test_email/data/msg_36.txt diff --git a/Lib/email/test/data/msg_37.txt b/Lib/test/test_email/data/msg_37.txt rename from Lib/email/test/data/msg_37.txt rename to Lib/test/test_email/data/msg_37.txt diff --git a/Lib/email/test/data/msg_38.txt b/Lib/test/test_email/data/msg_38.txt rename from Lib/email/test/data/msg_38.txt rename to Lib/test/test_email/data/msg_38.txt diff --git a/Lib/email/test/data/msg_39.txt b/Lib/test/test_email/data/msg_39.txt rename from Lib/email/test/data/msg_39.txt rename to Lib/test/test_email/data/msg_39.txt diff --git a/Lib/email/test/data/msg_40.txt b/Lib/test/test_email/data/msg_40.txt rename from Lib/email/test/data/msg_40.txt rename to Lib/test/test_email/data/msg_40.txt diff --git a/Lib/email/test/data/msg_41.txt b/Lib/test/test_email/data/msg_41.txt rename from Lib/email/test/data/msg_41.txt rename to Lib/test/test_email/data/msg_41.txt diff --git a/Lib/email/test/data/msg_42.txt b/Lib/test/test_email/data/msg_42.txt rename from Lib/email/test/data/msg_42.txt rename to Lib/test/test_email/data/msg_42.txt diff --git a/Lib/email/test/data/msg_43.txt b/Lib/test/test_email/data/msg_43.txt rename from Lib/email/test/data/msg_43.txt rename to Lib/test/test_email/data/msg_43.txt diff --git a/Lib/email/test/data/msg_44.txt b/Lib/test/test_email/data/msg_44.txt rename from Lib/email/test/data/msg_44.txt rename to Lib/test/test_email/data/msg_44.txt diff --git a/Lib/email/test/data/msg_45.txt b/Lib/test/test_email/data/msg_45.txt rename from Lib/email/test/data/msg_45.txt rename to Lib/test/test_email/data/msg_45.txt diff --git a/Lib/email/test/data/msg_46.txt b/Lib/test/test_email/data/msg_46.txt rename from Lib/email/test/data/msg_46.txt rename to Lib/test/test_email/data/msg_46.txt diff --git a/Lib/email/test/test_email_codecs.py b/Lib/test/test_email/test_asian_codecs.py rename from Lib/email/test/test_email_codecs.py rename to Lib/test/test_email/test_asian_codecs.py --- a/Lib/email/test/test_email_codecs.py +++ b/Lib/test/test_email/test_asian_codecs.py @@ -5,7 +5,7 @@ import unittest from test.support import run_unittest -from email.test.test_email import TestEmailBase +from test.test_email.test_email import TestEmailBase from email.charset import Charset from email.header import Header, decode_header from email.message import Message @@ -78,16 +78,5 @@ -def suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(TestEmailAsianCodecs)) - return suite
- -def test_main():
- run_unittest(TestEmailAsianCodecs)
- - if name == 'main':
- unittest.main(defaultTest='suite')
- unittest.main()
diff --git a/Lib/email/test/test_email.py b/Lib/test/test_email/test_email.py rename from Lib/email/test/test_email.py rename to Lib/test/test_email/test_email.py --- a/Lib/email/test/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -37,7 +37,7 @@ from email import quoprimime from test.support import findfile, run_unittest, unlink -from email.test import file as landmark +from test.test_email import file as landmark NL = '\n' @@ -4142,23 +4142,5 @@ -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():
- for testclass in _testclasses():
run_unittest(testclass)- if name == 'main':
- unittest.main(defaultTest='suite')
- unittest.main()
diff --git a/Lib/email/test/test_email_torture.py b/Lib/test/test_email/tourture_test.py rename from Lib/email/test/test_email_torture.py rename to Lib/test/test_email/tourture_test.py diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -278,6 +278,11 @@ Tests
+- The email test suite now lives in the Lib/test/test_email package. The test
- harness code has also been modernized to allow use of new unittest features.
- +- regrtest now discovers test packages as well as test modules.
Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov.
New test_crashers added to exercise the scripts in the Lib/test/crashers
-- Repository URL: http://hg.python.org/cpython
- Previous message: [Python-checkins] cpython: Move email tests to Lib/test package and modernize test runner machinery
- Next message: [Python-checkins] cpython (merge default -> default): Dummy merge to overlay fixed email.test move on top of borked move.
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]