Merge pull request #609 from nicoddemus/gh-actions

.github/workflows/main.yml

@@ -10,16 +10,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tox_env: 
-          - "py35-pytestlatest" 
-          - "py36-pytestlatest" 
-          - "py37-pytestlatest" 
-          - "py38-pytestlatest" 
-          - "py39-pytestlatest" 
-          - "py38-pytestmaster" 
-          - "py38-psutil" 
+        tox_env:
+          - "py35-pytestlatest"
+          - "py36-pytestlatest"
+          - "py37-pytestlatest"
+          - "py38-pytestlatest"
+          - "py39-pytestlatest"
+          - "py38-pytestmaster"
+          - "py38-psutil"
           - "linting"
-          
+
         os: [ubuntu-latest, windows-latest]
         include:
           - tox_env: "py35-pytestlatest"
@@ -37,7 +37,7 @@ jobs:
           - tox_env: "py38-psutil"
             python: "3.8"
           - tox_env: "linting"
-            python: "3.8"
+            python: "3.7"
 
     steps:
     - uses: actions/checkout@v1

README.rst

@@ -11,13 +11,8 @@
     :alt: Python versions
     :target: https://pypi.python.org/pypi/pytest-xdist
 
-.. image:: https://travis-ci.org/pytest-dev/pytest-xdist.svg?branch=master
-    :alt: Travis CI build status
-    :target: https://travis-ci.org/pytest-dev/pytest-xdist
-
-.. image:: https://ci.appveyor.com/api/projects/status/56eq1a1avd4sdd7e/branch/master?svg=true
-    :alt: AppVeyor build status
-    :target: https://ci.appveyor.com/project/pytestbot/pytest-xdist
+.. image:: https://github.com/pytest-dev/pytest-xdist/workflows/build/badge.svg
+    :target: https://github.com/pytest-dev/pytest-xdist/actions
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
     :target: https://github.com/ambv/black

testing/acceptance_test.py

@@ -772,19 +772,23 @@ def test_warning_captured_deprecated_in_pytest_6(self, testdir):
 
         testdir.makeconftest(
             """
-            def pytest_warning_captured():
-                assert False, "this hook should not be called in this version"
+            def pytest_warning_captured(warning_message):
+                if warning_message == "my custom worker warning":
+                    assert False, (
+                        "this hook should not be called from workers "
+                        "in this version: {}"
+                    ).format(warning_message)
         """
         )
         testdir.makepyfile(
             """
             import warnings
             def test():
-                warnings.warn("custom warning")
+                warnings.warn("my custom worker warning")
         """
         )
         result = testdir.runpytest("-n1")
-        result.stdout.fnmatch_lines(["* 1 passed in *"])
+        result.stdout.fnmatch_lines(["*1 passed*"])
         result.stdout.no_fnmatch_line("*this hook should not be called in this version")
 
     @pytest.mark.parametrize("n", ["-n0", "-n1"])

tox.ini

@@ -24,6 +24,7 @@ commands =
 [testenv:linting]
 skip_install = True
 usedevelop = True
+passenv = PRE_COMMIT_HOME
 deps =
   pre-commit
 commands = pre-commit run --all-files --show-diff-on-failure