summaryrefslogtreecommitdiff
path: root/doc/en/example
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2019-11-14 18:17:28 -0300
committerGitHub <noreply@github.com>2019-11-14 18:17:28 -0300
commite856638ba086fcf5bebf1bebea32d5cf78de87b4 (patch)
tree4024da6943c752a72e2ed45b8b57c03ccd047371 /doc/en/example
parentd4e4ab5b3d8bd8fd51430536808bfa3a0805689d (diff)
parentdd9a27cf543c39f91039ecd7aa6aa595b3e79330 (diff)
downloadpytest-e856638ba086fcf5bebf1bebea32d5cf78de87b4.tar.gz
Preparing release version 5.2.3 (#6190)
Preparing release version 5.2.3
Diffstat (limited to 'doc/en/example')
-rw-r--r--doc/en/example/parametrize.rst4
-rw-r--r--doc/en/example/reportingdemo.rst4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst
index 1220cfb4d..48ab95fda 100644
--- a/doc/en/example/parametrize.rst
+++ b/doc/en/example/parametrize.rst
@@ -475,10 +475,10 @@ Running it results in some skips if we don't have all the python interpreters in
.. code-block:: pytest
. $ pytest -rs -q multipython.py
- ssssssssssssssssssssssss... [100%]
+ ssssssssssss...ssssssssssss [100%]
========================= short test summary info ==========================
SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.5' not found
- SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.6' not found
+ SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.7' not found
3 passed, 24 skipped in 0.12s
Indirect parametrization of optional implementations/imports
diff --git a/doc/en/example/reportingdemo.rst b/doc/en/example/reportingdemo.rst
index eb978c5ea..1c06782f6 100644
--- a/doc/en/example/reportingdemo.rst
+++ b/doc/en/example/reportingdemo.rst
@@ -436,7 +436,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:
items = [1, 2, 3]
print("items is {!r}".format(items))
> a, b = items.pop()
- E TypeError: cannot unpack non-iterable int object
+ E TypeError: 'int' object is not iterable
failure_demo.py:181: TypeError
--------------------------- Captured stdout call ---------------------------
@@ -516,7 +516,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:
def test_z2_type_error(self):
items = 3
> a, b = items
- E TypeError: cannot unpack non-iterable int object
+ E TypeError: 'int' object is not iterable
failure_demo.py:222: TypeError
______________________ TestMoreErrors.test_startswith ______________________