summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2011-03-15 16:24:47 (GMT)
committerR David Murray <rdmurray@bitdance.com>2011-03-15 16:24:47 (GMT)
commitdf1d00a1e3d5ec1ee994ab0b002b974f22a6eaa4 (patch)
tree86857c1aad72537a81ce1a1a4439071523d51dd1 /Lib/test
parent2ef76981a0753db6373d8ba0194c345b6356a16f (diff)
parent56a9d7e3daff45f5fef206ea42398b4a0505fb47 (diff)
downloadcpython-df1d00a1e3d5ec1ee994ab0b002b974f22a6eaa4.zip
cpython-df1d00a1e3d5ec1ee994ab0b002b974f22a6eaa4.tar.gz
cpython-df1d00a1e3d5ec1ee994ab0b002b974f22a6eaa4.tar.bz2
Merge #11554 test_email_codecs activation from 3.2.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_email.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_email.py b/Lib/test/test_email.py
index f0a18e7..5eebba5 100644
--- a/Lib/test/test_email.py
+++ b/Lib/test/test_email.py
@@ -3,10 +3,12 @@
# 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()