MNT: simplify the sub-process test code

tacaswell · tacaswell · commit bbbe8d202864 · 2022-02-02T19:15:35.000-05:00
diff --git a/lib/matplotlib/tests/test_backend_tk.py b/lib/matplotlib/tests/test_backend_tk.py
@@ -28,13 +28,19 @@ def _isolated_tk_test(success_count, func=None):
     if "MPL_TEST_ESCAPE_HATCH" in os.environ:
         return func
 
+    @pytest.mark.skipif(
+        importlib.util.find_spec('tkinter'),
+        reason="missing tkinter"
+    )
+    @pytest.mark.skipif(
+        sys.platform == "linux" and not _c_internal_utils.display_is_valid(),
+        reason="$DISPLAY and $WAYLAND_DISPLAY are unset"
+    )
     @functools.wraps(func)
     def test_func():
-        if (sys.platform == "linux" and
-                not _c_internal_utils.display_is_valid()):
-            pytest.skip("$DISPLAY and $WAYLAND_DISPLAY are unset")
-        elif not importlib.util.find_spec('tkinter'):
-            pytest.skip("missing tkinter")
+        # even if the package exists, may not actually be importable this can
+        # be the case on some CI systems.
+        pytest.importorskip('tkinter')
         try:
             proc = subprocess_run_helper(
                 func, timeout=_test_timeout,
