summaryrefslogtreecommitdiff
path: root/Doc/library
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-09-15 02:01:39 +0200
committerAntoine Pitrou <solipsis@pitrou.net>2013-09-15 02:01:39 +0200
commitfab7335158bafbccc3ae83d6939e620ea2b6bb06 (patch)
treedb4ef222cdb019f5333d629dacaf8da8298b898e /Doc/library
parent0a57e74805259cba972e7dfb5b50903a89f94fb9 (diff)
downloadcpython-fab7335158bafbccc3ae83d6939e620ea2b6bb06.tar.gz
Address Terry's comments
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/unittest.rst7
1 files changed, 5 insertions, 2 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 380f058135..c13f9ca3d6 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -883,8 +883,8 @@ Test cases
- It is also possible to check that exceptions and warnings are raised using
- the following methods:
+ It is also possible to check the production of exceptions, warnings and
+ log messages using the following methods:
+---------------------------------------------------------+--------------------------------------+------------+
| Method | Checks that | New in |
@@ -901,6 +901,9 @@ Test cases
| :meth:`assertWarnsRegex(warn, r, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *warn* | 3.2 |
| <TestCase.assertWarnsRegex>` | and the message matches regex *r* | |
+---------------------------------------------------------+--------------------------------------+------------+
+ | :meth:`assertLogs(logger, level)` | The ``with`` block logs on *logger* | 3.4 |
+ | <TestCase.assertWarns>` | with minimum *level* | |
+ +---------------------------------------------------------+--------------------------------------+------------+
.. method:: assertRaises(exception, callable, *args, **kwds)
assertRaises(exception, msg=None)