Use pytest-xvfb in conda and enforce QtAgg only in one run

bnavigator · bnavigator · commit 7d6fdd898adb · 2022-08-20T12:05:04.000+02:00
diff --git a/.github/conda-env/test-env.yml b/.github/conda-env/test-env.yml
@@ -6,6 +6,7 @@ dependencies:
   - pytest
   - pytest-cov
   - pytest-timeout
+  - pytest-xvfb
   - numpy
   - matplotlib
   - scipy
diff --git a/.github/workflows/control-slycot-src.yml b/.github/workflows/control-slycot-src.yml
@@ -13,13 +13,8 @@ jobs:
         path: python-control
     - name: Set up Python
       uses: actions/setup-python@v2
-    - name: Install Python dependencies
-      run: |
-        # Set up (virtual) X11
-        sudo apt-get -y install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
-
-        # Install python-control with dependencies including test tools
-        pip install -v -e './python-control[test]'
+    - name: Install Python dependencies and test tools
+      run: pip install -v -e './python-control[test]'
 
     - name: Checkout Slycot
       uses: actions/checkout@v3
@@ -43,4 +38,4 @@ jobs:
 
     - name: Test with pytest
       working-directory: python-control
-      run: xvfb-run pytest control/tests
+      run: pytest -v control/tests
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -10,6 +10,7 @@ jobs:
       ${{ matrix.pandas || 'no' }} Pandas;
       ${{ matrix.cvxopt || 'no' }} CVXOPT
       ${{ matrix.array-and-matrix == 1 && '; array and matrix' || '' }}
+      ${{ matrix.mplbackend && format('; {0}', matrix.mplbackend) }}
     runs-on: ubuntu-latest
 
     strategy:
@@ -20,20 +21,19 @@ jobs:
         slycot: ["", "conda"]
         pandas: [""]
         cvxopt: ["", "conda"]
+        mplbackend: [""]
         array-and-matrix: [0]
         include:
           - python-version: '3.10'
             slycot: conda
             pandas: conda
             cvxopt: conda
+            mplbackend: QtAgg
             array-and-matrix: 1
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up (virtual) X11
-      run:  sudo apt-get -y install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
-
     - name: Setup Conda
       uses: conda-incubator/setup-miniconda@v2
       with:
@@ -64,7 +64,8 @@ jobs:
       shell: bash -l {0}
       env:
         PYTHON_CONTROL_ARRAY_AND_MATRIX: ${{ matrix.array-and-matrix }}
-      run: xvfb-run pytest --cov=control --cov-config=.coveragerc control/tests
+        MPLBACKEND: ${{ matrix.mplbackend }}
+      run: pytest -v --cov=control --cov-config=.coveragerc control/tests
 
     - name: Coveralls parallel
       # https://github.com/coverallsapp/github-action
diff --git a/control/tests/rlocus_test.py b/control/tests/rlocus_test.py
@@ -85,6 +85,8 @@ def test_root_locus_neg_false_gain_nonproper(self):
 
     # TODO: cover and validate negative false_gain branch in _default_gains()
 
+    @pytest.mark.skipif(plt.get_current_fig_manager().toolbar is None,
+                        reason="Requires the zoom toolbar")
     def test_root_locus_zoom(self):
         """Check the zooming functionality of the Root locus plot"""
         system = TransferFunction([1000], [1, 25, 100, 0])
diff --git a/control/tests/sisotool_test.py b/control/tests/sisotool_test.py
@@ -46,6 +46,8 @@ def sys221(self):
         D221 = [[1., -1.]]
         return StateSpace(A222, B222, C221, D221)
 
+    @pytest.mark.skipif(plt.get_current_fig_manager().toolbar is None,
+                        reason="Requires the zoom toolbar")
     def test_sisotool(self, tsys):
         sisotool(tsys, Hz=False)
         fig = plt.gcf()
@@ -114,6 +116,8 @@ def test_sisotool(self, tsys):
         assert_array_almost_equal(
             ax_step.lines[0].get_data()[1][:10], step_response_moved, 4)
 
+    @pytest.mark.skipif(plt.get_current_fig_manager().toolbar is None,
+                        reason="Requires the zoom toolbar")
     @pytest.mark.parametrize('tsys', [0, True],
                              indirect=True, ids=['ctime', 'dtime'])
     def test_sisotool_tvect(self, tsys):
