update xvfb configuration; remove X11 marks

murrayrm · murrayrm · commit 5bb9de40c6ee · 2021-01-11T21:15:19.000-08:00
diff --git a/.github/workflows/control-slycot-src.yml b/.github/workflows/control-slycot-src.yml
@@ -15,8 +15,11 @@ jobs:
         # Set up conda
         echo $CONDA/bin >> $GITHUB_PATH
 
+        # Set up (virtual) X11
+        sudo apt install -y xvfb
+
         # Install test tools
-        conda install pip pytest 
+        conda install pip pytest
 
         # Install python-control dependencies
         conda install numpy matplotlib scipy
@@ -33,4 +36,4 @@ jobs:
         cd slycot; python setup.py build_ext install -DBLA_VENDOR=Generic
 
     - name: Test with pytest
-      run: pytest control/tests
+      run: xvfb-run --auto-servernum pytest control/tests
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -23,15 +23,15 @@ jobs:
       run: |
         # Set up conda
         echo $CONDA/bin >> $GITHUB_PATH
-        conda create -q -n test-environment python=${{matrix.python-version}} 
+        conda create -q -n test-environment python=${{matrix.python-version}}
         source $CONDA/bin/activate test-environment
 
         # Set up (virtual) X11
         sudo apt install -y xvfb
 
         # Install test tools
-        conda install pip coverage pytest 
-        conda install -c conda-forge pytest-xvfb pytest-cov
+        conda install pip coverage pytest
+        conda install -c conda-forge pytest-cov
 
         # Install python-control dependencies
         conda install numpy matplotlib scipy
@@ -43,4 +43,6 @@ jobs:
         PYTHON_CONTROL_ARRAY_AND_MATRIX: ${{ matrix.array-and-matrix }}
       run: |
         source $CONDA/bin/activate test-environment
+        # Use xvfb-run instead of pytest-xvfb to get proper mpl backend
+        # See https://github.com/python-control/python-control/pull/504
         xvfb-run --auto-servernum pytest control/tests
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -26,8 +26,7 @@
                                           "PendingDeprecationWarning")
 matrixerrorfilter = pytest.mark.filterwarnings("error:.*matrix subclass:"
                                                "PendingDeprecationWarning")
-X11only = pytest.mark.skipif(os.getenv("DISPLAY") is None,
-                             reason="requires X11")
+
 
 @pytest.fixture(scope="session", autouse=True)
 def control_defaults():
diff --git a/control/tests/rlocus_test.py b/control/tests/rlocus_test.py
@@ -13,8 +13,6 @@
 from control.statesp import StateSpace
 from control.bdalg import feedback
 
-from control.tests.conftest import X11only
-
 
 class TestRootLocus:
     """These are tests for the feedback function in rlocus.py."""
@@ -50,7 +48,6 @@ def test_without_gains(self, sys):
         roots, kvect = root_locus(sys, plot=False)
         self.check_cl_poles(sys, roots, kvect)
 
-    @X11only
     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
@@ -9,7 +9,6 @@
 from control.rlocus import _RLClickDispatcher
 from control.xferfcn import TransferFunction
 
-from control.tests.conftest import X11only
 
 @pytest.mark.usefixtures("mplcleanup")
 class TestSisotool:
@@ -20,7 +19,6 @@ def sys(self):
         """Return a generic SISO transfer function"""
         return TransferFunction([1000], [1, 25, 100, 0])
 
-    @X11only
     def test_sisotool(self, sys):
         sisotool(sys, Hz=False)
         fig = plt.gcf()
