Merge pull request #23231 from oscargus/usepytest-xvfb

QuLogic · web-flow · commit 8eeda292de0c · 2022-06-21T14:06:46.000-04:00
Add pytest-xvfb as test dependency
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,23 +36,18 @@ jobs:
             extra-requirements: '-c requirements/testing/minver.txt'
             pyqt5-ver: '==5.11.2 sip==5.0.0'  # oldest versions with a Py3.8 wheel.
             delete-font-cache: true
-            XVFB_RUN: xvfb-run -a
           - os: ubuntu-18.04
             python-version: 3.8
             extra-requirements: '-r requirements/testing/extra.txt'
-            XVFB_RUN: xvfb-run -a
             CFLAGS: "-fno-lto"  # Ensure that disabling LTO works.
           - os: ubuntu-20.04
             python-version: 3.9
             extra-requirements: '-r requirements/testing/extra.txt'
-            XVFB_RUN: xvfb-run -a
           - os: ubuntu-20.04
             python-version: '3.10'
             extra-requirements: '-r requirements/testing/extra.txt'
-            XVFB_RUN: xvfb-run -a
           - os: macos-latest
             python-version: 3.8
-            XVFB_RUN: ""
 
     steps:
       - uses: actions/checkout@v3
@@ -257,7 +252,7 @@ jobs:
 
       - name: Run pytest
         run: |
-          ${{ matrix.XVFB_RUN }} python -mpytest -raR -n auto \
+          python -mpytest -raR -n auto \
             --maxfail=50 --timeout=300 --durations=25 \
             --cov-report=xml --cov=lib --log-level=DEBUG --color=yes
 
diff --git a/doc/devel/dependencies.rst b/doc/devel/dependencies.rst
@@ -198,14 +198,16 @@ Optional:
 - pytest-flake8_ to test coding standards using flake8_
 - pytest-timeout_ to limit runtime in case of stuck tests
 - pytest-xdist_ to run tests in parallel
+- pytest-xvfb_ to run tests without windows popping up (Linux)
 
 .. _pytest: http://doc.pytest.org/en/latest/
 .. _Ghostscript: https://www.ghostscript.com/
 .. _Inkscape: https://inkscape.org
 .. _pytest-cov: https://pytest-cov.readthedocs.io/en/latest/
 .. _pytest-flake8: https://pypi.org/project/pytest-flake8/
-.. _pytest-xdist: https://pypi.org/project/pytest-xdist/
 .. _pytest-timeout: https://pypi.org/project/pytest-timeout/
+.. _pytest-xdist: https://pypi.org/project/pytest-xdist/
+.. _pytest-xvfb: https://pypi.org/project/pytest-xvfb/
 .. _flake8: https://pypi.org/project/flake8/
 
 
diff --git a/requirements/testing/all.txt b/requirements/testing/all.txt
@@ -8,4 +8,5 @@ pytest-cov
 pytest-rerunfailures
 pytest-timeout
 pytest-xdist
+pytest-xvfb
 tornado
