Merge pull request #23194 from tacaswell/auto-backport-of-pr-23095-on-v3.5.x

oscargus · web-flow · commit bcd72f8725ab · 2022-06-03T10:18:22.000+02:00
Backport PR #23095: Try to unbreak CI by xfailing OSX Tk tests
diff --git a/lib/matplotlib/tests/test_backend_tk.py b/lib/matplotlib/tests/test_backend_tk.py
@@ -31,6 +31,10 @@ def _isolated_tk_test(success_count, func=None):
     # Remove decorators.
     source = re.search(r"(?ms)^def .*", inspect.getsource(func)).group(0)
 
+    @pytest.mark.xfail(  # GitHub issue #23094
+        sys.platform == 'darwin',
+        reason="Tk version mismatch on OSX CI"
+    )
     @functools.wraps(func)
     def test_func():
         try:
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -59,6 +59,9 @@ def _get_testable_interactive_backends():
         elif env["MPLBACKEND"].startswith('wx') and sys.platform == 'darwin':
             # ignore on OSX because that's currently broken (github #16849)
             marks.append(pytest.mark.xfail(reason='github #16849'))
+        elif env["MPLBACKEND"] == "tkagg" and sys.platform == 'darwin':
+            marks.append(  # GitHub issue #23094
+                pytest.mark.xfail(reason="Tk version mismatch on OSX CI"))
         envs.append(pytest.param(env, marks=marks, id=str(env)))
     return envs
 
@@ -231,6 +234,9 @@ def _test_thread_impl():
                 reason='PyPy does not support Tkinter threading: '
                        'https://foss.heptapod.net/pypy/pypy/-/issues/1929',
                 strict=True))
+    elif backend == "tkagg" and sys.platform == "darwin":
+        param.marks.append(  # GitHub issue #23094
+            pytest.mark.xfail("Tk version mismatch on OSX CI"))
 
 
 @pytest.mark.parametrize("env", _thread_safe_backends)
