Merge remote-tracking branch 'upstream/master' into robholt/fixture-c…

…lass-instance
pytest-dev · Aug 30, 2019 · 955dc6d · 955dc6d
2 parents 3ddbc7f + 01082fe
commit 955dc6d
Show file tree

Hide file tree

Showing 48 changed files with 624 additions and 418 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
     hooks:
     -   id: flake8
         language_version: python3
-        additional_dependencies: [flake8-typing-imports]
+        additional_dependencies: [flake8-typing-imports==1.3.0]
 -   repo: https://github.com/asottile/reorder_python_imports
     rev: v1.4.0
     hooks:

diff --git a/.travis.yml b/.travis.yml
@@ -43,7 +43,8 @@ jobs:
       python: 'pypy3'
 
     - env: TOXENV=py35-xdist
-      python: '3.5'
+      dist: trusty
+      python: '3.5.0'
 
     # Coverage for:
     # - pytester's LsofFdLeakChecker

diff --git a/AUTHORS b/AUTHORS
@@ -55,6 +55,7 @@ Charnjit SiNGH (CCSJ)
 Chris Lamb
 Christian Boelsen
 Christian Fetzer
+Christian Neumüller
 Christian Theunert
 Christian Tismer
 Christopher Gilling

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -18,6 +18,15 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 5.1.1 (2019-08-20)
+=========================
+
+Bug Fixes
+---------
+
+- `#5751 <https://github.com/pytest-dev/pytest/issues/5751>`_: Fixed ``TypeError`` when importing pytest on Python 3.5.0 and 3.5.1.
+
+
 pytest 5.1.0 (2019-08-15)
 =========================
 

diff --git a/changelog/5782.bugfix.rst b/changelog/5782.bugfix.rst
@@ -0,0 +1 @@
+Fix decoding error when printing an error response from ``--pastebin``.
diff --git a/changelog/5786.bugfix.rst b/changelog/5786.bugfix.rst
@@ -0,0 +1,2 @@
+Chained exceptions in test and collection reports are now correctly serialized, allowing plugins like
+``pytest-xdist`` to display them properly.
diff --git a/changelog/5792.bugfix.rst b/changelog/5792.bugfix.rst
@@ -0,0 +1,3 @@
+Windows: Fix error that occurs in certain circumstances when loading
+``conftest.py`` from a working directory that has casing other than the one stored
+in the filesystem (e.g., ``c:\test`` instead of ``C:\test``).
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-5.1.1
    release-5.1.0
    release-5.0.1
    release-5.0.0

diff --git a/doc/en/announce/release-5.1.1.rst b/doc/en/announce/release-5.1.1.rst
@@ -0,0 +1,24 @@
+pytest-5.1.1
+=======================================
+
+pytest 5.1.1 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
+* Daniel Hahler
+* Florian Bruhin
+* Hugo van Kemenade
+* Ran Benita
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/assert.rst b/doc/en/assert.rst
@@ -47,7 +47,7 @@ you will see the return value of the function call:
     E        +  where 3 = f()
 
     test_assert1.py:6: AssertionError
-    ============================ 1 failed in 0.05s =============================
+    ============================ 1 failed in 0.02s =============================
 
 ``pytest`` has support for showing the values of the most common subexpressions
 including calls, attributes, comparisons, and binary and unary
@@ -208,7 +208,7 @@ if you run this module:
     E         Use -v to get the full diff
 
     test_assert2.py:6: AssertionError
-    ============================ 1 failed in 0.05s =============================
+    ============================ 1 failed in 0.02s =============================
 
 Special comparisons are done for a number of cases:
 
@@ -279,7 +279,7 @@ the conftest file:
    E            vals: 1 != 2
 
    test_foocompare.py:12: AssertionError
-   1 failed in 0.05s
+   1 failed in 0.02s
 
 .. _assert-details:
 .. _`assert introspection`:

diff --git 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.01s
+    no tests ran in 0.00s
 
 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
@@ -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.16s
+    2 failed, 48 passed in 0.08s
 
 If you then run it with ``--lf``:
 
@@ -114,7 +114,7 @@ If you then run it with ``--lf``:
     E           Failed: bad luck
 
     test_50.py:7: Failed
-    ===================== 2 failed, 48 deselected in 0.07s =====================
+    ===================== 2 failed, 48 deselected in 0.02s =====================
 
 You have run only the two failing tests from the last run, while the 48 passing
 tests have not been run ("deselected").
@@ -158,7 +158,7 @@ of ``FF`` and dots):
     E           Failed: bad luck
 
     test_50.py:7: Failed
-    ======================= 2 failed, 48 passed in 0.15s =======================
+    ======================= 2 failed, 48 passed in 0.07s =======================
 
 .. _`config.cache`:
 
@@ -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.05s
+    1 failed in 0.02s
 
 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.05s
+    1 failed in 0.02s
 
 See the :ref:`cache-api` for more details.
 
@@ -300,7 +300,7 @@ filtering:
     example/value contains:
       42
 
-    ========================== no tests ran in 0.01s ===========================
+    ========================== no tests ran in 0.00s ===========================
 
 Clearing Cache content
 ----------------------

diff --git a/doc/en/capture.rst b/doc/en/capture.rst
@@ -91,7 +91,7 @@ of the failing function and hide the other one:
     test_module.py:12: AssertionError
     -------------------------- Captured stdout setup ---------------------------
     setting up <function test_func2 at 0xdeadbeef>
-    ======================= 1 failed, 1 passed in 0.05s ========================
+    ======================= 1 failed, 1 passed in 0.02s ========================
 
 Accessing captured output from a test function
 ---------------------------------------------------

diff --git a/doc/en/doctest.rst b/doc/en/doctest.rst
@@ -36,7 +36,7 @@ then you can just invoke ``pytest`` directly:
 
     test_example.txt .                                                   [100%]
 
-    ============================ 1 passed in 0.02s =============================
+    ============================ 1 passed in 0.01s =============================
 
 By default, pytest will collect ``test*.txt`` files looking for doctest directives, but you
 can pass additional globs using the ``--doctest-glob`` option (multi-allowed).
@@ -66,7 +66,7 @@ and functions, including from test modules:
     mymodule.py .                                                        [ 50%]
     test_example.txt .                                                   [100%]
 
-    ============================ 2 passed in 0.03s =============================
+    ============================ 2 passed in 0.01s =============================
 
 You can make these changes permanent in your project by
 putting them into a pytest.ini file like this:

diff --git a/doc/en/example/markers.rst b/doc/en/example/markers.rst
@@ -69,7 +69,7 @@ Or the inverse, running all tests except the webtest ones:
     test_server.py::test_another PASSED                                  [ 66%]
     test_server.py::TestClass::test_method PASSED                        [100%]
 
-    ===================== 3 passed, 1 deselected in 0.02s ======================
+    ===================== 3 passed, 1 deselected in 0.01s ======================
 
 Selecting tests based on their node ID
 --------------------------------------
@@ -120,7 +120,7 @@ Or select multiple nodes:
     test_server.py::TestClass::test_method PASSED                        [ 50%]
     test_server.py::test_send_http PASSED                                [100%]
 
-    ============================ 2 passed in 0.02s =============================
+    ============================ 2 passed in 0.01s =============================
 
 .. _node-id:
 
@@ -176,7 +176,7 @@ And you can also run all tests except the ones that match the keyword:
     test_server.py::test_another PASSED                                  [ 66%]
     test_server.py::TestClass::test_method PASSED                        [100%]
 
-    ===================== 3 passed, 1 deselected in 0.02s ======================
+    ===================== 3 passed, 1 deselected in 0.01s ======================
 
 Or to select "http" and "quick" tests:
 
@@ -192,7 +192,7 @@ Or to select "http" and "quick" tests:
     test_server.py::test_send_http PASSED                                [ 50%]
     test_server.py::test_something_quick PASSED                          [100%]
 
-    ===================== 2 passed, 2 deselected in 0.02s ======================
+    ===================== 2 passed, 2 deselected in 0.01s ======================
 
 .. note::
 
@@ -413,7 +413,7 @@ the test needs:
 
     test_someenv.py s                                                    [100%]
 
-    ============================ 1 skipped in 0.01s ============================
+    ============================ 1 skipped in 0.00s ============================
 
 and here is one that specifies exactly the environment needed:
 
@@ -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.00s
 
 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``.
 
@@ -623,7 +623,7 @@ then you will see two tests skipped and two executed tests as expected:
 
     ========================= short test summary info ==========================
     SKIPPED [2] $REGENDOC_TMPDIR/conftest.py:13: cannot run on platform linux
-    ======================= 2 passed, 2 skipped in 0.02s =======================
+    ======================= 2 passed, 2 skipped in 0.01s =======================
 
 Note that if you specify a platform via the marker-command line option like this:
 
@@ -711,7 +711,7 @@ We can now use the ``-m option`` to select one set:
     test_module.py:8: in test_interface_complex
         assert 0
     E   assert 0
-    ===================== 2 failed, 2 deselected in 0.07s ======================
+    ===================== 2 failed, 2 deselected in 0.02s ======================
 
 or to select both "event" and "interface" tests:
 
@@ -739,4 +739,4 @@ or to select both "event" and "interface" tests:
     test_module.py:12: in test_event_simple
         assert 0
     E   assert 0
-    ===================== 3 failed, 1 deselected in 0.07s ======================
+    ===================== 3 failed, 1 deselected in 0.03s ======================
diff --git a/doc/en/example/nonpython.rst b/doc/en/example/nonpython.rst
@@ -41,7 +41,7 @@ now execute the test specification:
     usecase execution failed
        spec failed: 'some': 'other'
        no further details known at this point.
-    ======================= 1 failed, 1 passed in 0.06s ========================
+    ======================= 1 failed, 1 passed in 0.02s ========================
 
 .. regendoc:wipe
 
@@ -77,7 +77,7 @@ consulted when reporting in ``verbose`` mode:
     usecase execution failed
        spec failed: 'some': 'other'
        no further details known at this point.
-    ======================= 1 failed, 1 passed in 0.07s ========================
+    ======================= 1 failed, 1 passed in 0.02s ========================
 
 .. regendoc:wipe
 
@@ -97,4 +97,4 @@ interesting to just look at the collection tree:
         <YamlItem hello>
         <YamlItem ok>
 
-    ========================== no tests ran in 0.05s ===========================
+    ========================== no tests ran in 0.02s ===========================