Merge master into features

15 files changed, 56 insertions, 32 deletions

diff --git a/doc/en/Makefile b/doc/en/Makefile
index bfeb96c8c..51b0fa9e2 100644
--- a/doc/en/Makefile
+++ b/doc/en/Makefile
@@ -16,7 +16,7 @@ REGENDOC_ARGS := \
 	--normalize "/[ \t]+\n/\n/" \
 	--normalize "~\$$REGENDOC_TMPDIR~/home/sweet/project~" \
 	--normalize "~/path/to/example~/home/sweet/project~" \
-	--normalize "/in \d+.\d+s ==/in 0.12s ==/" \
+	--normalize "/in \d.\d\ds/in 0.12s/" \
 	--normalize "@/tmp/pytest-of-.*/pytest-\d+@PYTEST_TMPDIR@" \
 	--normalize "@pytest-(\d+)\\.[^ ,]+@pytest-\1.x.y@" \
 	--normalize "@(This is pytest version )(\d+)\\.[^ ,]+@\1\2.x.y@" \
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index 81f977ef1..a601b247e 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-5.1.3
    release-5.1.2
    release-5.1.1
    release-5.1.0
diff --git a/doc/en/announce/release-5.1.3.rst b/doc/en/announce/release-5.1.3.rst
new file mode 100644
index 000000000..882b79bde
--- /dev/null
+++ b/doc/en/announce/release-5.1.3.rst
@@ -0,0 +1,23 @@
+pytest-5.1.3
+=======================================
+
+pytest 5.1.3 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Christian Neumüller
+* Daniel Hahler
+* Gene Wood
+* Hugo
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/assert.rst b/doc/en/assert.rst
index 04ee9c0f6..995edfaa8 100644
--- a/doc/en/assert.rst
+++ b/doc/en/assert.rst
@@ -279,7 +279,7 @@ the conftest file:
    E            vals: 1 != 2
 
    test_foocompare.py:12: AssertionError
-   1 failed in 0.02s
+   1 failed in 0.12s
 
 .. _assert-details:
 .. _`assert introspection`:
diff --git a/doc/en/builtin.rst b/doc/en/builtin.rst
index fc8b3f40f..7f41b87c7 100644
--- a/doc/en/builtin.rst
+++ b/doc/en/builtin.rst
@@ -160,7 +160,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
             in python < 3.6 this is a pathlib2.Path
 
 
-    no tests ran in 0.00s
+    no tests ran in 0.12s
 
 You can also interactively ask for help, e.g. by typing on the Python interactive prompt something like:
 
diff --git a/doc/en/cache.rst b/doc/en/cache.rst
index 38e00cc0c..974c480a5 100644
--- a/doc/en/cache.rst
+++ b/doc/en/cache.rst
@@ -75,7 +75,7 @@ If you run this for the first time you will see two failures:
     E           Failed: bad luck
 
     test_50.py:7: Failed
-    2 failed, 48 passed in 0.07s
+    2 failed, 48 passed in 0.12s
 
 If you then run it with ``--lf``:
 
@@ -230,7 +230,7 @@ If you run this command for the first time, you can see the print statement:
     test_caching.py:20: AssertionError
     -------------------------- Captured stdout setup ---------------------------
     running expensive computation...
-    1 failed in 0.02s
+    1 failed in 0.12s
 
 If you run it a second time, the value will be retrieved from
 the cache and nothing will be printed:
@@ -249,7 +249,7 @@ the cache and nothing will be printed:
     E       assert 42 == 23
 
     test_caching.py:20: AssertionError
-    1 failed in 0.02s
+    1 failed in 0.12s
 
 See the :ref:`cache-api` for more details.
 
diff --git a/doc/en/example/markers.rst b/doc/en/example/markers.rst
index bb2fbb22a..ccddb1f66 100644
--- a/doc/en/example/markers.rst
+++ b/doc/en/example/markers.rst
@@ -499,7 +499,7 @@ The output is as follows:
     $ pytest -q -s
     Mark(name='my_marker', args=(<function hello_world at 0xdeadbeef>,), kwargs={})
     .
-    1 passed in 0.01s
+    1 passed in 0.12s
 
 We can see that the custom marker has its argument set extended with the function ``hello_world``. This is the key difference between creating a custom marker as a callable, which invokes ``__call__`` behind the scenes, and using ``with_args``.
 
@@ -551,7 +551,7 @@ Let's run this without capturing output and see what we get:
     glob args=('class',) kwargs={'x': 2}
     glob args=('module',) kwargs={'x': 1}
     .
-    1 passed in 0.02s
+    1 passed in 0.12s
 
 marking platform specific tests with pytest
 --------------------------------------------------------------
diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst
index 19cdcc293..640106ccd 100644
--- a/doc/en/example/parametrize.rst
+++ b/doc/en/example/parametrize.rst
@@ -54,7 +54,7 @@ This means that we only run 2 tests if we do not pass ``--all``:
 
     $ pytest -q test_compute.py
     ..                                                                   [100%]
-    2 passed in 0.01s
+    2 passed in 0.12s
 
 We run only two computations, so we see two dots.
 let's run the full monty:
@@ -73,7 +73,7 @@ let's run the full monty:
     E       assert 4 < 4
 
     test_compute.py:4: AssertionError
-    1 failed, 4 passed in 0.02s
+    1 failed, 4 passed in 0.12s
 
 As expected when running the full range of ``param1`` values
 we'll get an error on the last one.
@@ -343,7 +343,7 @@ And then when we run the test:
     E           Failed: deliberately failing for demo purposes
 
     test_backends.py:8: Failed
-    1 failed, 1 passed in 0.02s
+    1 failed, 1 passed in 0.12s
 
 The first invocation with ``db == "DB1"`` passed while the second with ``db == "DB2"`` failed.  Our ``db`` fixture function has instantiated each of the DB values during the setup phase while the ``pytest_generate_tests`` generated two according calls to the ``test_db_initialized`` during the collection phase.
 
@@ -454,7 +454,7 @@ argument sets to use for each test function.  Let's run it:
     E       assert 1 == 2
 
     test_parametrize.py:21: AssertionError
-    1 failed, 2 passed in 0.03s
+    1 failed, 2 passed in 0.12s
 
 Indirect parametrization with multiple fixtures
 --------------------------------------------------------------
@@ -479,7 +479,7 @@ Running it results in some skips if we don't have all the python interpreters in
    ========================= 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.7' not found
-   3 passed, 24 skipped in 0.24s
+   3 passed, 24 skipped in 0.12s
 
 Indirect parametrization of optional implementations/imports
 --------------------------------------------------------------------
diff --git a/doc/en/example/simple.rst b/doc/en/example/simple.rst
index 913769c35..71ac77f7b 100644
--- a/doc/en/example/simple.rst
+++ b/doc/en/example/simple.rst
@@ -65,7 +65,7 @@ Let's run this without supplying our new option:
     test_sample.py:6: AssertionError
     --------------------------- Captured stdout call ---------------------------
     first
-    1 failed in 0.02s
+    1 failed in 0.12s
 
 And now with supplying a command line option:
 
@@ -89,7 +89,7 @@ And now with supplying a command line option:
     test_sample.py:6: AssertionError
     --------------------------- Captured stdout call ---------------------------
     second
-    1 failed in 0.02s
+    1 failed in 0.12s
 
 You can see that the command line option arrived in our test.  This
 completes the basic pattern.  However, one often rather wants to process
@@ -261,7 +261,7 @@ Let's run our little function:
     E       Failed: not configured: 42
 
     test_checkconfig.py:11: Failed
-    1 failed in 0.02s
+    1 failed in 0.12s
 
 If you only want to hide certain exceptions, you can set ``__tracebackhide__``
 to a callable which gets the ``ExceptionInfo`` object. You can for example use
@@ -445,7 +445,7 @@ Now we can profile which test functions execute the slowest:
 
     ========================= slowest 3 test durations =========================
     0.30s call     test_some_are_slow.py::test_funcslow2
-    0.20s call     test_some_are_slow.py::test_funcslow1
+    0.21s call     test_some_are_slow.py::test_funcslow1
     0.10s call     test_some_are_slow.py::test_funcfast
     ============================ 3 passed in 0.12s =============================
 
diff --git a/doc/en/example/special.rst b/doc/en/example/special.rst
index 9ad55f3d7..6886b6268 100644
--- a/doc/en/example/special.rst
+++ b/doc/en/example/special.rst
@@ -81,4 +81,4 @@ If you run this without output capturing:
     .test other
     .test_unit1 method called
     .
-    4 passed in 0.01s
+    4 passed in 0.12s
diff --git a/doc/en/fixture.rst b/doc/en/fixture.rst
index fe222146c..d5f4a85e3 100644
--- a/doc/en/fixture.rst
+++ b/doc/en/fixture.rst
@@ -387,7 +387,7 @@ Let's execute it:
     $ pytest -s -q --tb=no
     FFteardown smtp
 
-    2 failed in 0.79s
+    2 failed in 0.12s
 
 We see that the ``smtp_connection`` instance is finalized after the two
 tests finished execution.  Note that if we decorated our fixture
@@ -541,7 +541,7 @@ again, nothing much has changed:
     $ pytest -s -q --tb=no
     FFfinalizing <smtplib.SMTP object at 0xdeadbeef> (smtp.gmail.com)
 
-    2 failed in 0.77s
+    2 failed in 0.12s
 
 Let's quickly create another test module that actually sets the
 server URL in its module namespace:
@@ -718,7 +718,7 @@ So let's just do another run:
     test_module.py:13: AssertionError
     ------------------------- Captured stdout teardown -------------------------
     finalizing <smtplib.SMTP object at 0xdeadbeef>
-    4 failed in 1.69s
+    4 failed in 0.12s
 
 We see that our two test functions each ran twice, against the different
 ``smtp_connection`` instances.  Note also, that with the ``mail.python.org``
@@ -1069,7 +1069,7 @@ to verify our fixture is activated and the tests pass:
 
     $ pytest -q
     ..                                                                   [100%]
-    2 passed in 0.01s
+    2 passed in 0.12s
 
 You can specify multiple fixtures like this:
 
@@ -1177,7 +1177,7 @@ If we run it, we get two passing tests:
 
     $ pytest -q
     ..                                                                   [100%]
-    2 passed in 0.01s
+    2 passed in 0.12s
 
 Here is how autouse fixtures work in other scopes:
 
diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst
index 455e93622..2bdd68ea3 100644
--- a/doc/en/getting-started.rst
+++ b/doc/en/getting-started.rst
@@ -108,7 +108,7 @@ Execute the test function with “quiet” reporting mode:
 
     $ pytest -q test_sysexit.py
     .                                                                    [100%]
-    1 passed in 0.01s
+    1 passed in 0.12s
 
 Group multiple tests in a class
 --------------------------------------------------------------
@@ -145,7 +145,7 @@ Once you develop multiple tests, you may want to group them into a class. pytest
     E        +  where False = hasattr('hello', 'check')
 
     test_class.py:8: AssertionError
-    1 failed, 1 passed in 0.02s
+    1 failed, 1 passed in 0.12s
 
 The first test passed and the second failed. You can easily see the intermediate values in the assertion to help you understand the reason for the failure.
 
@@ -180,7 +180,7 @@ List the name ``tmpdir`` in the test function signature and ``pytest`` will look
     test_tmpdir.py:3: AssertionError
     --------------------------- Captured stdout call ---------------------------
     PYTEST_TMPDIR/test_needsfiles0
-    1 failed in 0.02s
+    1 failed in 0.12s
 
 More info on tmpdir handling is available at :ref:`Temporary directories and files <tmpdir handling>`.
 
diff --git a/doc/en/parametrize.rst b/doc/en/parametrize.rst
index e02ff2e53..072065c83 100644
--- a/doc/en/parametrize.rst
+++ b/doc/en/parametrize.rst
@@ -205,7 +205,7 @@ If we now pass two stringinput values, our test will run twice:
 
     $ pytest -q --stringinput="hello" --stringinput="world" test_strings.py
     ..                                                                   [100%]
-    2 passed in 0.01s
+    2 passed in 0.12s
 
 Let's also run with a stringinput that will lead to a failing test:
 
@@ -225,7 +225,7 @@ Let's also run with a stringinput that will lead to a failing test:
     E        +    where <built-in method isalpha of str object at 0xdeadbeef> = '!'.isalpha
 
     test_strings.py:4: AssertionError
-    1 failed in 0.02s
+    1 failed in 0.12s
 
 As expected our test function fails.
 
@@ -239,7 +239,7 @@ list:
     s                                                                    [100%]
     ========================= short test summary info ==========================
     SKIPPED [1] test_strings.py: got empty parameter set ['stringinput'], function test_valid_string at $REGENDOC_TMPDIR/test_strings.py:2
-    1 skipped in 0.00s
+    1 skipped in 0.12s
 
 Note that when calling ``metafunc.parametrize`` multiple times with different parameter sets, all parameter names across
 those sets cannot be duplicated, otherwise an error will be raised.
diff --git a/doc/en/unittest.rst b/doc/en/unittest.rst
index dc55cc0ed..0f6737c0d 100644
--- a/doc/en/unittest.rst
+++ b/doc/en/unittest.rst
@@ -219,7 +219,7 @@ Running this test module ...:
 
     $ pytest -q test_unittest_cleandir.py
     .                                                                    [100%]
-    1 passed in 0.01s
+    1 passed in 0.12s
 
 ... gives us one passed test because the ``initdir`` fixture function
 was executed ahead of the ``test_method``.
diff --git a/doc/en/warnings.rst b/doc/en/warnings.rst
index 90245a0d4..54bb60da1 100644
--- a/doc/en/warnings.rst
+++ b/doc/en/warnings.rst
@@ -64,7 +64,7 @@ them into errors:
     E       UserWarning: api v1, should use functions from v2
 
     test_show_warnings.py:5: UserWarning
-    1 failed in 0.02s
+    1 failed in 0.12s
 
 The same option can be set in the ``pytest.ini`` file using the ``filterwarnings`` ini option.
 For example, the configuration below will ignore all user warnings, but will transform
@@ -407,7 +407,7 @@ defines an ``__init__`` constructor, as this prevents the class from being insta
         class Test:
 
     -- Docs: https://docs.pytest.org/en/latest/warnings.html
-    1 warnings in 0.00s
+    1 warnings in 0.12s
 
 These warnings might be filtered using the same builtin mechanisms used to filter other types of warnings.