summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-11-18 22:39:42 (GMT)
committerGitHub <noreply@github.com>2020-11-18 22:39:42 (GMT)
commit5f463e501b9667d1059a1e916d59d19cdd6addf7 (patch)
tree8ba9f7696c50ae8d8bb16b7dca0d95934f981c93
parent8b1f4cc4644869812ff7f210a7fcbe872d88846e (diff)
downloadcpython-5f463e501b9667d1059a1e916d59d19cdd6addf7.zip
cpython-5f463e501b9667d1059a1e916d59d19cdd6addf7.tar.gz
cpython-5f463e501b9667d1059a1e916d59d19cdd6addf7.tar.bz2
[3.8] bpo-38320: Clarify that expectedFailure is satisfied by either failure or error of the test. (GH-22740) (GH-22782)
(cherry picked from commit fa8748271a61177e9bf609921fa464cc6990478b) Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>
-rw-r--r--Doc/library/unittest.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 7626a40..d41ff1f 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -593,8 +593,9 @@ The following decorators and exception implement test skipping and expected fail
.. decorator:: expectedFailure
- Mark the test as an expected failure. If the test fails it will be
- considered a success. If the test passes, it will be considered a failure.
+ Mark the test as an expected failure or error. If the test fails or errors
+ it will be considered a success. If the test passes, it will be considered
+ a failure.
.. exception:: SkipTest(reason)
@@ -1946,7 +1947,7 @@ Loading and running tests
A list containing 2-tuples of :class:`TestCase` instances and strings
holding formatted tracebacks. Each tuple represents an expected failure
- of the test case.
+ or error of the test case.
.. attribute:: unexpectedSuccesses
@@ -2072,8 +2073,8 @@ Loading and running tests
.. method:: addExpectedFailure(test, err)
- Called when the test case *test* fails, but was marked with the
- :func:`expectedFailure` decorator.
+ Called when the test case *test* fails or errors, but was marked with
+ the :func:`expectedFailure` decorator.
The default implementation appends a tuple ``(test, formatted_err)`` to
the instance's :attr:`expectedFailures` attribute, where *formatted_err*