[Python-checkins] r78004 - in python/branches/py3k: Lib/unittest/case.py

Fri Feb 5 23:58:21 CET 2010

Author: michael.foord
Date: Fri Feb 5 23:58:21 2010
New Revision: 78004
Log:
Merged revisions 78003 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r78003 | michael.foord | 2010年02月05日 22:55:09 +0000 (2010年2月05日) | 1 line
 
 Improving docstrings in unittest.TestCase
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/unittest/case.py
Modified: python/branches/py3k/Lib/unittest/case.py
==============================================================================

--- python/branches/py3k/Lib/unittest/case.py	(original)
+++ python/branches/py3k/Lib/unittest/case.py	Fri Feb 5 23:58:21 2010
@@ -231,10 +231,6 @@
 """Returns both the test method name and first line of its docstring.
 
 If no docstring is given, only returns the method name.
-
- This method overrides unittest.TestCase.shortDescription(), which
- only returns the first line of the docstring, obscuring the name
- of the test upon failure.
 """
 desc = str(self)
 doc_first_line = None
@@ -397,8 +393,17 @@
 If called with callableObj omitted or None, will return a
 context object used like this::
 
- with self.assertRaises(some_error_class):
+ with self.assertRaises(SomeException):
 do_something()
+
+ The context manager keeps a reference to the exception as
+ the exc_value attribute. This allows you to inspect the
+ exception after the assertion::
+
+ with self.assertRaises(SomeException) as cm:
+ do_something()
+ the_exception = cm.exc_value
+ self.assertEquals(the_exception.error_code, 3)
 """
 context = _AssertRaisesContext(excClass, self, callableObj)
 if callableObj is None:
@@ -746,6 +751,11 @@
 
 Raises with an error message listing which elements of expected_seq
 are missing from actual_seq and vice versa if any.
+
+ Duplicate elements are ignored when comparing *expected_seq* and
+ *actual_seq*. It is the equivalent of ``assertEqual(set(expected),
+ set(actual))`` but it works with sequences of unhashable objects as
+ well.
 """
 try:
 expected = set(expected_seq)
