TST: handle change in pytest.importorskip behavior

tacaswell · QuLogic · commit bb489d730744 · 2024-10-03T15:36:27.000-04:00
It now warns if the module is found, but fails to import (rather than
not existing and raising ModuleNotFound).
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -5,6 +5,7 @@
 from unittest import mock
 
 from cycler import cycler, Cycler
+from packaging.version import parse as parse_version
 import pytest
 
 import matplotlib as mpl
@@ -539,7 +540,12 @@ def test_backend_fallback_headless(tmp_path):
     sys.platform == "linux" and not _c_internal_utils.xdisplay_is_valid(),
     reason="headless")
 def test_backend_fallback_headful(tmp_path):
-    pytest.importorskip("tkinter")
+    if parse_version(pytest.__version__) >= parse_version('8.2.0'):
+        pytest_kwargs = dict(exc_type=ImportError)
+    else:
+        pytest_kwargs = {}
+
+    pytest.importorskip("tkinter", **pytest_kwargs)
     env = {**os.environ, "MPLBACKEND": "", "MPLCONFIGDIR": str(tmp_path)}
     backend = subprocess_run_for_testing(
         [sys.executable, "-c",
