Make sure the email test suite can be run both stand-alone and under
supervision of regrtest.py. Will backport to 2.2.2.
diff --git a/Lib/test/test_email.py b/Lib/test/test_email.py
index 5df5960..de0eee3 100644
--- 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())
-
if __name__ == '__main__':
- unittest.main(defaultTest='suite')
+ test_main()