Merge pull request #8691 from anntzer/fix-interactive-backends-testing

QuLogic · web-flow · commit 6dd935b23229 · 2017-05-31T16:37:19.000-04:00
Fix skipif in interactive backends test.
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -19,12 +19,14 @@
 # an undesirable input hook).
 
 
-def _get_available_backends():
+def _get_testable_interactive_backends():
     return [
-        pytest.mark.skipif(sys.version_info < (3,)
-                           or importlib.util.find_spec(module_name) is None,
-                           reason="Could not import {!r}".format(module_name))(
-                               backend)
+        pytest.mark.skipif(
+            not os.environ.get("DISPLAY")
+            or sys.version_info < (3,)
+            or importlib.util.find_spec(module_name) is None,
+            reason="No $DISPLAY or could not import {!r}".format(module_name))(
+                backend)
         for module_name, backend in [
                 ("PyQt5", "qt5agg"),
                 ("tkinter", "tkagg"),
@@ -41,9 +43,7 @@ def _get_available_backends():
 """
 
 
-@pytest.mark.skipif("DISPLAY" not in os.environ,
-                    reason="The DISPLAY environment variable is not set.")
-@pytest.mark.parametrize("backend", _get_available_backends())
+@pytest.mark.parametrize("backend", _get_testable_interactive_backends())
 def test_backend(backend):
     environ = os.environ.copy()
     environ["MPLBACKEND"] = backend
