Merge pull request #1133 from python-trio/dependabot/pip/pytest-5.0.0

Bump pytest from 4.6.3 to 5.0.0

Author: oremanj

ci.sh

@@ -120,7 +120,7 @@ else
 
     INSTALLDIR=$(python -c "import os, trio; print(os.path.dirname(trio.__file__))")
     cp ../setup.cfg $INSTALLDIR
-    pytest -W error -ra --junitxml=../test-results.xml --run-slow --faulthandler-timeout=60 ${INSTALLDIR} --cov="$INSTALLDIR" --cov-config=../.coveragerc --verbose
+    pytest -W error -r a --junitxml=../test-results.xml --run-slow ${INSTALLDIR} --cov="$INSTALLDIR" --cov-config=../.coveragerc --verbose
 
     # Disable coverage on 3.8 until we run 3.8 on Windows CI too
     #   https://github.com/python-trio/trio/pull/784#issuecomment-446438407

setup.cfg

@@ -1,2 +1,3 @@
 [tool:pytest]
 xfail_strict = true
+faulthandler_timeout=60

test-requirements.in

@@ -1,10 +1,9 @@
 # For tests
-pytest >= 3.3  # for catchlog fixture
+pytest >= 5.0  # for faulthandler in core
 pytest-cov >= 2.6.0
 ipython        # for the IPython traceback integration tests
 pyOpenSSL      # for the ssl tests
 trustme        # for the ssl tests
-pytest-faulthandler
 pylint         # for pylint finding all symbols tests
 jedi           # for jedi code completion tests
 

test-requirements.txt

@@ -44,9 +44,8 @@ pylint==2.3.1
 pyopenssl==19.0.0
 pyparsing==2.4.0          # via packaging
 pytest-cov==2.7.1
-pytest-faulthandler==1.6.0
-pytest==4.6.3
-six==1.12.0               # via astroid, cryptography, packaging, prompt-toolkit, pyopenssl, pytest, traitlets
+pytest==5.0.0
+six==1.12.0               # via astroid, cryptography, packaging, prompt-toolkit, pyopenssl, traitlets
 sniffio==1.1.0
 sortedcontainers==2.1.0
 traitlets==4.3.2          # via ipython

trio/tests/test_exports.py

@@ -55,6 +55,14 @@ def public_namespaces(module):
     sys.version_info.releaselevel == "alpha",
     reason="skip static introspection tools on Python dev/alpha releases",
 )
+@pytest.mark.filterwarnings(
+    # https://github.com/PyCQA/astroid/issues/681
+    "ignore:the imp module is deprecated.*:DeprecationWarning"
+)
+@pytest.mark.filterwarnings(
+    # Same as above, but on Python 3.5
+    "ignore:the imp module is deprecated.*:PendingDeprecationWarning"
+)
 @pytest.mark.parametrize("modname", NAMESPACES)
 @pytest.mark.parametrize("tool", ["pylint", "jedi"])
 def test_static_tool_sees_all_symbols(tool, modname):

trio/tests/test_windows_pipes.py

@@ -93,7 +93,7 @@ async def write_forever():
             with pytest.raises(_core.ClosedResourceError) as excinfo:
                 while True:
                     await w.send_all(b"x" * 4096)
-            assert "another task" in str(excinfo)
+            assert "another task" in str(excinfo.value)
 
         nursery.start_soon(write_forever)
         await wait_all_tasks_blocked(0.1)