skip X11 tests if no DISPLAY env variable

murrayrm · murrayrm · commit d83e67d0f37f · 2021-01-10T09:06:08.000-08:00
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -26,7 +26,8 @@
                                           "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,6 +13,8 @@
 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."""
@@ -48,6 +50,7 @@ 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,6 +9,7 @@
 from control.rlocus import _RLClickDispatcher
 from control.xferfcn import TransferFunction
 
+from control.tests.conftest import X11only
 
 @pytest.mark.usefixtures("mplcleanup")
 class TestSisotool:
@@ -19,6 +20,7 @@ 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()
