Backport:

Make sure the email test suite can be run both stand-alone and under
supervision of regrtest.py.

diff --git a/Lib/test/test_email.py b/Lib/test/test_email.py
index 5df59606086a676d131f2743fcf02d64d647aa2b..de0eee36b3572b4bc856f5b39ba25551d7391a00 100644 (file)
--- a/Lib/test/test_email.py
+++ b/Lib/test/test_email.py
@@ -4,8 +4,10 @@
 import unittest
 # The specific tests now live in Lib/email/test
 from email.test.test_email import suite
+from test.test_support import run_suite
 
+def test_main():
+    run_suite(suite())
 
-\f
 if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
+    test_main()