summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-09-15 00:01:39 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-09-15 00:01:39 (GMT)
commit7c89ae206e6fc7dc08c789f9f9db7094f6723419 (patch)
tree6f5f83f588b60be7956939f3e117d05ed62510a0
parent04d4d6a3aa5ffc64ab691a02692afc784dd3f5a2 (diff)
downloadcpython-7c89ae206e6fc7dc08c789f9f9db7094f6723419.zip
cpython-7c89ae206e6fc7dc08c789f9f9db7094f6723419.tar.gz
cpython-7c89ae206e6fc7dc08c789f9f9db7094f6723419.tar.bz2
Address Terry's comments
-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 380f058..c13f9ca 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)