[Python-checkins] r76238 - in python/branches/py3k: Doc/library/unittest.rst Lib/test/test_unittest.py Lib/unittest/case.py

[kristjan.jonsson]

Author: kristjan.jonsson
Date: Fri Nov 13 17:10:13 2009
New Revision: 76238

Log:
Merged revisions 74556 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74556 | kristjan.jonsson | 2009-08-27 22:20:21 +0000 (fim., 27 ßg·. 2009) | 2 lines
  
  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/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/unittest.rst
   python/branches/py3k/Lib/test/test_unittest.py
   python/branches/py3k/Lib/unittest/case.py

Modified: python/branches/py3k/Doc/library/unittest.rst
==============================================================================
--- python/branches/py3k/Doc/library/unittest.rst	(original)
+++ python/branches/py3k/Doc/library/unittest.rst	Fri Nov 13 17:10:13 2009
@@ -891,12 +891,19 @@
          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:: 3.1
          Added the ability to use :meth:`assertRaises` as a context manager.
 
       .. deprecated:: 3.1
          :meth:`failUnlessRaises`.
 
+      .. versionchanged:: 3.1
+         Added the :attr:`exc_value` attribute.
+
 
    .. method:: assertRaisesRegexp(exception, regexp[, callable, ...])
 

Modified: python/branches/py3k/Lib/test/test_unittest.py
==============================================================================
--- python/branches/py3k/Lib/test/test_unittest.py	(original)
+++ python/branches/py3k/Lib/test/test_unittest.py	Fri Nov 13 17:10:13 2009
@@ -2847,6 +2847,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/branches/py3k/Lib/unittest/case.py
==============================================================================
--- python/branches/py3k/Lib/unittest/case.py	(original)
+++ python/branches/py3k/Lib/unittest/case.py	Fri Nov 13 17:10:13 2009
@@ -116,6 +116,9 @@
         if not issubclass(exc_type, self.expected):
             # let unexpected exceptions pass through
             return False
+        #store exception, without traceback, for later retrieval
+        self.exc_value = exc_value
+        self.exc_value.with_traceback(None)
         if self.expected_regex is None:
             return True