[Python-checkins] r74556 - in python/trunk: Doc/library/unittest.rst Lib/test/test_unittest.py Lib/unittest/case.py

[kristjan.jonsson]

Author: kristjan.jonsson
Date: Fri Aug 28 00:20:21 2009
New Revision: 74556

Log:
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.

Modified:
   python/trunk/Doc/library/unittest.rst
   python/trunk/Lib/test/test_unittest.py
   python/trunk/Lib/unittest/case.py

Modified: python/trunk/Doc/library/unittest.rst
==============================================================================
--- python/trunk/Doc/library/unittest.rst	(original)
+++ python/trunk/Doc/library/unittest.rst	Fri Aug 28 00:20:21 2009
@@ -888,6 +888,10 @@
          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.
 

Modified: python/trunk/Lib/test/test_unittest.py
==============================================================================
--- python/trunk/Lib/test/test_unittest.py	(original)
+++ python/trunk/Lib/test/test_unittest.py	Fri Aug 28 00:20:21 2009
@@ -2821,6 +2821,21 @@
                 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.
 

Modified: python/trunk/Lib/unittest/case.py
==============================================================================
--- python/trunk/Lib/unittest/case.py	(original)
+++ python/trunk/Lib/unittest/case.py	Fri Aug 28 00:20:21 2009
@@ -104,6 +104,7 @@
         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