summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-03-13 22:02:22 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-03-13 22:02:22 (GMT)
commit910df329fd4f4206966e98ddf81ae169e0ca4d1d (patch)
tree88d116ce9a04bb1fcfe25e89d89d64361a015218
parentd2edfd64bafc00496b80f4febb4e28cfea6ed4a9 (diff)
downloadcpython-910df329fd4f4206966e98ddf81ae169e0ca4d1d.zip
cpython-910df329fd4f4206966e98ddf81ae169e0ca4d1d.tar.gz
cpython-910df329fd4f4206966e98ddf81ae169e0ca4d1d.tar.bz2
#8315: add automatic unittest test discovery in test.test_email
-rw-r--r--Lib/test/test_email/__init__.py10
-rw-r--r--Misc/NEWS5
2 files changed, 15 insertions, 0 deletions
diff --git a/Lib/test/test_email/__init__.py b/Lib/test/test_email/__init__.py
index 280afbd..d72b50e 100644
--- a/Lib/test/test_email/__init__.py
+++ b/Lib/test/test_email/__init__.py
@@ -5,6 +5,16 @@ import test.support
import email
from test.test_email import __file__ as landmark
+# Run all tests in package for '-m unittest test.test_email'
+def load_tests(loader, standard_tests, pattern):
+ this_dir = os.path.dirname(__file__)
+ if pattern is None:
+ pattern = "test*"
+ package_tests = loader.discover(start_dir=this_dir, pattern=pattern)
+ standard_tests.addTests(package_tests)
+ return standard_tests
+
+
# used by regrtest and __main__.
def test_main():
here = os.path.dirname(__file__)
diff --git a/Misc/NEWS b/Misc/NEWS
index 88e5e84..b0dab74 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,11 @@ Extension Modules
- Issue #14259: The finditer() method of re objects did not take any
keyword arguments, contrary to the documentation.
+Tests
+-----
+
+- Issue #8315: (partial fix) python -m unittest test.test_email now works.
+
What's New in Python 3.3.0 Alpha 1?
===================================