From: Irit Katriel <iritkatriel@yahoo.com>
Date: Mon, 19 Oct 2020 21:27:16 +0000 (+0100)
Subject: bpo-38320: Clarify that expectedFailure is satisfied by either failure or error of... 
X-Git-Tag: v3.10.0a2~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa8748271a61177e9bf609921fa464cc6990478b;p=thirdparty%2FPython%2Fcpython.git

bpo-38320: Clarify that expectedFailure is satisfied by either failure or error of the test. (GH-22740)
---

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index f04ec91270ee..51e10119d3e8 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)
 
@@ -1967,7 +1968,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
 
@@ -2093,8 +2094,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*