issue 6275

Add an "exc_value" attribute to the _AssertRaisesContext context manager in the unittest package.  This allows further tests on the exception that was raised after the context manager exits.

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 25d792dcc5f92a709de03049f5de7cefbc282b6c..a2d4478a02b37e5d7e74c42d04bdd87a072860d5 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -888,6 +888,10 @@ Test cases
          with self.failUnlessRaises(some_error_class):
              do_something()
 
+      The context manager will store the caught exception object in its
+      :attr:`exc_value` attribute.  This can be useful if the intention
+      is to perform additional checks on the exception raised.
+
       .. versionchanged:: 2.7
          Added the ability to use :meth:`assertRaises` as a context manager.
 

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index cca1836ddede763f1b3d796635948aad4b061dbf..5c3921dfd984f58a867af0af3ba4834c57248929 100644 (file)
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -2821,6 +2821,21 @@ test case
                 self.assertRaisesRegexp, Exception,
                 re.compile('^Expected$'), Stub)
 
+    def testAssertRaisesExcValue(self):
+        class ExceptionMock(Exception):
+            pass
+
+        def Stub(foo):
+            raise ExceptionMock(foo)
+        v = "particular value"
+
+        ctx = self.assertRaises(ExceptionMock)
+        with ctx:
+            Stub(v)
+        e = ctx.exc_value
+        self.assertTrue(isinstance(e, ExceptionMock))
+        self.assertEqual(e.args[0], v)
+
     def testSynonymAssertMethodNames(self):
         """Test undocumented method name synonyms.
 

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 6ffdacbf388230625322a041facfeb93aa533d38..d52bc8d8505573f7f98bccfc41d9445c0c02c839 100644 (file)
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -104,6 +104,7 @@ class _AssertRaisesContext(object):
         if not issubclass(exc_type, self.expected):
             # let unexpected exceptions pass through
             return False
+        self.exc_value = exc_value #store for later retrieval
         if self.expected_regex is None:
             return True