mirror of
https://github.com/python/cpython.git
synced 2025-09-19 07:00:59 +00:00
Rolled back revisions 74556 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
This commit is contained in:
parent
38c34ef5de
commit
676161a850
3 changed files with 0 additions and 20 deletions
|
@ -891,10 +891,6 @@ Test cases
|
||||||
with self.failUnlessRaises(some_error_class):
|
with self.failUnlessRaises(some_error_class):
|
||||||
do_something()
|
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
|
.. versionchanged:: 3.1
|
||||||
Added the ability to use :meth:`assertRaises` as a context manager.
|
Added the ability to use :meth:`assertRaises` as a context manager.
|
||||||
|
|
||||||
|
|
|
@ -2846,21 +2846,6 @@ test case
|
||||||
self.assertRaisesRegexp, Exception,
|
self.assertRaisesRegexp, Exception,
|
||||||
re.compile('^Expected$'), Stub)
|
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):
|
def testSynonymAssertMethodNames(self):
|
||||||
"""Test undocumented method name synonyms.
|
"""Test undocumented method name synonyms.
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,6 @@ class _AssertRaisesContext(object):
|
||||||
if not issubclass(exc_type, self.expected):
|
if not issubclass(exc_type, self.expected):
|
||||||
# let unexpected exceptions pass through
|
# let unexpected exceptions pass through
|
||||||
return False
|
return False
|
||||||
self.exc_value = exc_value #store for later retrieval
|
|
||||||
if self.expected_regex is None:
|
if self.expected_regex is None:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue