#19006: merge with 3.5.

This commit is contained in:
Ezio Melotti 2016-01-12 11:03:54 +02:00
commit 997e6c1dd8
1 changed files with 4 additions and 3 deletions

View File

@ -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:
+---------------------------------------------------------+--------------------------------------+------------+