cpython: 0d8afab5249f (original) (raw)

Mercurial > cpython

changeset 68819:0d8afab5249f

Correctly move email package tests to Lib/test.

line wrap: on

line diff

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()

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

rename from Lib/email/test/data/PyBanner048.gif rename to Lib/test/test_email/data/PyBanner048.gif

rename from Lib/email/test/data/audiotest.au rename to Lib/test/test_email/data/audiotest.au

rename from Lib/email/test/data/msg_01.txt rename to Lib/test/test_email/data/msg_01.txt

rename from Lib/email/test/data/msg_02.txt rename to Lib/test/test_email/data/msg_02.txt

rename from Lib/email/test/data/msg_03.txt rename to Lib/test/test_email/data/msg_03.txt

rename from Lib/email/test/data/msg_04.txt rename to Lib/test/test_email/data/msg_04.txt

rename from Lib/email/test/data/msg_05.txt rename to Lib/test/test_email/data/msg_05.txt

rename from Lib/email/test/data/msg_06.txt rename to Lib/test/test_email/data/msg_06.txt

rename from Lib/email/test/data/msg_07.txt rename to Lib/test/test_email/data/msg_07.txt

rename from Lib/email/test/data/msg_08.txt rename to Lib/test/test_email/data/msg_08.txt

rename from Lib/email/test/data/msg_09.txt rename to Lib/test/test_email/data/msg_09.txt

rename from Lib/email/test/data/msg_10.txt rename to Lib/test/test_email/data/msg_10.txt

rename from Lib/email/test/data/msg_11.txt rename to Lib/test/test_email/data/msg_11.txt

rename from Lib/email/test/data/msg_12.txt rename to Lib/test/test_email/data/msg_12.txt

rename from Lib/email/test/data/msg_12a.txt rename to Lib/test/test_email/data/msg_12a.txt

rename from Lib/email/test/data/msg_13.txt rename to Lib/test/test_email/data/msg_13.txt

rename from Lib/email/test/data/msg_14.txt rename to Lib/test/test_email/data/msg_14.txt

rename from Lib/email/test/data/msg_15.txt rename to Lib/test/test_email/data/msg_15.txt

rename from Lib/email/test/data/msg_16.txt rename to Lib/test/test_email/data/msg_16.txt

rename from Lib/email/test/data/msg_17.txt rename to Lib/test/test_email/data/msg_17.txt

rename from Lib/email/test/data/msg_18.txt rename to Lib/test/test_email/data/msg_18.txt

rename from Lib/email/test/data/msg_19.txt rename to Lib/test/test_email/data/msg_19.txt

rename from Lib/email/test/data/msg_20.txt rename to Lib/test/test_email/data/msg_20.txt

rename from Lib/email/test/data/msg_21.txt rename to Lib/test/test_email/data/msg_21.txt

rename from Lib/email/test/data/msg_22.txt rename to Lib/test/test_email/data/msg_22.txt

rename from Lib/email/test/data/msg_23.txt rename to Lib/test/test_email/data/msg_23.txt

rename from Lib/email/test/data/msg_24.txt rename to Lib/test/test_email/data/msg_24.txt

rename from Lib/email/test/data/msg_25.txt rename to Lib/test/test_email/data/msg_25.txt

rename from Lib/email/test/data/msg_26.txt rename to Lib/test/test_email/data/msg_26.txt

rename from Lib/email/test/data/msg_27.txt rename to Lib/test/test_email/data/msg_27.txt

rename from Lib/email/test/data/msg_28.txt rename to Lib/test/test_email/data/msg_28.txt

rename from Lib/email/test/data/msg_29.txt rename to Lib/test/test_email/data/msg_29.txt

rename from Lib/email/test/data/msg_30.txt rename to Lib/test/test_email/data/msg_30.txt

rename from Lib/email/test/data/msg_31.txt rename to Lib/test/test_email/data/msg_31.txt

rename from Lib/email/test/data/msg_32.txt rename to Lib/test/test_email/data/msg_32.txt

rename from Lib/email/test/data/msg_33.txt rename to Lib/test/test_email/data/msg_33.txt

rename from Lib/email/test/data/msg_34.txt rename to Lib/test/test_email/data/msg_34.txt

rename from Lib/email/test/data/msg_35.txt rename to Lib/test/test_email/data/msg_35.txt

rename from Lib/email/test/data/msg_36.txt rename to Lib/test/test_email/data/msg_36.txt

rename from Lib/email/test/data/msg_37.txt rename to Lib/test/test_email/data/msg_37.txt

rename from Lib/email/test/data/msg_38.txt rename to Lib/test/test_email/data/msg_38.txt

rename from Lib/email/test/data/msg_39.txt rename to Lib/test/test_email/data/msg_39.txt

rename from Lib/email/test/data/msg_40.txt rename to Lib/test/test_email/data/msg_40.txt

rename from Lib/email/test/data/msg_41.txt rename to Lib/test/test_email/data/msg_41.txt

rename from Lib/email/test/data/msg_42.txt rename to Lib/test/test_email/data/msg_42.txt

rename from Lib/email/test/data/msg_43.txt rename to Lib/test/test_email/data/msg_43.txt

rename from Lib/email/test/data/msg_44.txt rename to Lib/test/test_email/data/msg_44.txt

rename from Lib/email/test/data/msg_45.txt rename to Lib/test/test_email/data/msg_45.txt

rename from Lib/email/test/data/msg_46.txt rename to Lib/test/test_email/data/msg_46.txt

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 @@ Hello World! =?iso-2022-jp?b?GyRCJU8lbSE  -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()

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 base64mime 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 @@ class TestSigned(TestEmailBase): -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))[](#l53.26)

• return suite

- - -def test_main():

• for testclass in _testclasses():

•    run_unittest(testclass)[](#l53.32)

- - - if name == 'main':

• unittest.main(defaultTest='suite')

• unittest.main()

rename from Lib/email/test/test_email_torture.py rename to Lib/test/test_email/tourture_test.py

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -278,6 +278,11 @@ Tools/Demos 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