[Python-checkins] cpython (3.4): Issue #22903: The fake test case created by unittest.loader when it fails
antoine.pitrou
python-checkins at python.org
Thu Mar 19 00:01:45 CET 2015
https://hg.python.org/cpython/rev/f3977f34cf6c
changeset: 95052:f3977f34cf6c
branch: 3.4
parent: 95050:ac43268da908
user: Antoine Pitrou <solipsis at pitrou.net>
date: Wed Mar 18 23:56:46 2015 +0100
summary:
Issue #22903: The fake test case created by unittest.loader when it fails importing a test module is now picklable.
files:
Lib/unittest/loader.py | 29 +++++++++++-----
Lib/unittest/test/test_discovery.py | 9 +++++
Misc/NEWS | 3 +
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -19,20 +19,31 @@
VALID_MODULE_NAME = re.compile(r'[_a-z]\w*\.py$', re.IGNORECASE)
+class _FailedTest(case.TestCase):
+ _testMethodName = None
+
+ def __init__(self, method_name, exception):
+ self._exception = exception
+ super(_FailedTest, self).__init__(method_name)
+
+ def __getattr__(self, name):
+ if name != self._testMethodName:
+ return super(_FailedTest, self).__getattr__(name)
+ def testFailure():
+ raise self._exception
+ return testFailure
+
+
def _make_failed_import_test(name, suiteClass):
message = 'Failed to import test module: %s\n%s' % (name, traceback.format_exc())
- return _make_failed_test('ModuleImportFailure', name, ImportError(message),
- suiteClass)
+ return _make_failed_test(name, ImportError(message), suiteClass)
def _make_failed_load_tests(name, exception, suiteClass):
- return _make_failed_test('LoadTestsFailure', name, exception, suiteClass)
+ return _make_failed_test(name, exception, suiteClass)
-def _make_failed_test(classname, methodname, exception, suiteClass):
- def testFailure(self):
- raise exception
- attrs = {methodname: testFailure}
- TestClass = type(classname, (case.TestCase,), attrs)
- return suiteClass((TestClass(methodname),))
+def _make_failed_test(methodname, exception, suiteClass):
+ test = _FailedTest(methodname, exception)
+ return suiteClass((test,))
def _make_skipped_test(methodname, exception, suiteClass):
@case.skip(str(exception))
diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -2,6 +2,7 @@
import re
import sys
import types
+import pickle
import builtins
from test import support
@@ -216,6 +217,10 @@
with self.assertRaises(ImportError):
test.test_this_does_not_exist()
+ # Check picklability
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ pickle.loads(pickle.dumps(test, proto))
+
def test_discover_with_module_that_raises_SkipTest_on_import(self):
loader = unittest.TestLoader()
@@ -232,6 +237,10 @@
suite.run(result)
self.assertEqual(len(result.skipped), 1)
+ # Check picklability
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ pickle.loads(pickle.dumps(suite, proto))
+
def test_command_line_handling_parseArgs(self):
program = TestableTestProgram()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,9 @@
Library
-------
+- Issue #22903: The fake test case created by unittest.loader when it fails
+ importing a test module is now picklable.
+
- Issue #23568: Add rdivmod support to MagicMock() objects.
Patch by Håkan Lövdahl.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list