summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2016-01-12 09:03:54 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2016-01-12 09:03:54 (GMT)
commit997e6c1dd854cc35870525a0d434d9b01b6715d3 (patch)
tree16ae1f215407fd3cb66504e0c18a08dfcdb5fbc5
parente2c9adb03baabc10096461ba658e728c51694660 (diff)
parentf418db2e8cb21638448acbea0ce1d5bbfd0d903e (diff)
downloadcpython-997e6c1dd854cc35870525a0d434d9b01b6715d3.zip
cpython-997e6c1dd854cc35870525a0d434d9b01b6715d3.tar.gz
cpython-997e6c1dd854cc35870525a0d434d9b01b6715d3.tar.bz2
#19006: merge with 3.5.
-rw-r--r--Doc/library/unittest.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 6caf552..9647b4b 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -762,8 +762,9 @@ Test cases
.. _assert-methods:
- The :class:`TestCase` class provides a number of methods to check for and
- report failures, such as:
+ The :class:`TestCase` class provides several assert methods to check for and
+ report failures. The following table lists the most commonly used methods
+ (see the tables below for more assert methods):
+-----------------------------------------+-----------------------------+---------------+
| Method | Checks that | New in |
@@ -884,7 +885,7 @@ Test cases
- It is also possible to check the production of exceptions, warnings and
+ It is also possible to check the production of exceptions, warnings, and
log messages using the following methods:
+---------------------------------------------------------+--------------------------------------+------------+