Patch #1529686: also run test_email_codecs with regrtest.py.

diff --git a/Lib/test/test_email_codecs.py b/Lib/test/test_email_codecs.py
index aadd53738c34217eb3bc7c446a25f85d51e60ce4..c550a6f81d3a34465ce4f751edec0d62f56de0c9 100644 (file)
--- a/Lib/test/test_email_codecs.py
+++ b/Lib/test/test_email_codecs.py
@@ -1,11 +1,15 @@
 # Copyright (C) 2002 Python Software Foundation
 # email package unit tests for (optional) Asian codecs
 
-import unittest
 # The specific tests now live in Lib/email/test
-from email.test.test_email_codecs import suite
+from email.test import test_email_codecs
+from email.test import test_email_codecs_renamed
+from test import test_support
 
+def test_main():
+    suite = test_email_codecs.suite()
+    suite.addTest(test_email_codecs_renamed.suite())
+    test_support.run_suite(suite)
 
-\f
 if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
+    test_main()

diff --git a/Misc/NEWS b/Misc/NEWS
index ff46fa49c8cef1a2b1a50f210e9e60f3d8460ff6..d874115d12b91bf724dec2f0fa9862fd03dd86a4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -142,9 +142,9 @@ Tests
   how long the test file should take to play.  Now accepts taking 2.93 secs
   (exact time) +/- 10% instead of the hard-coded 3.1 sec.
 
-- Patch #1529686: The standard tests ``test_defaultdict``, ``test_iterlen``
-  and ``test_uuid`` didn't actually run any tests when run via ``regrtest.py``.
-  Now they do.
+- Patch #1529686: The standard tests ``test_defaultdict``, ``test_iterlen``,
+  ``test_uuid`` and ``test_email_codecs`` didn't actually run any tests when
+  run via ``regrtest.py``. Now they do.
 
 
 What's New in Python 2.5 beta 2?