Merge pull request #21296 from meeseeksmachine/auto-backport-of-pr-21288-on-v3.5.x

timhoffm · web-flow · commit cb58a9aed8a8 · 2021-10-06T13:04:52.000+02:00
Backport PR #21288 on branch v3.5.x (Allow macosx thread safety test on macOS11)
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -222,8 +222,14 @@ def _test_thread_impl():
         param.marks.append(
             pytest.mark.xfail(raises=subprocess.CalledProcessError))
     elif backend == "macosx":
-        param.marks.append(
-            pytest.mark.xfail(raises=subprocess.TimeoutExpired, strict=True))
+        from packaging.version import parse
+        mac_ver = platform.mac_ver()[0]
+        # Note, macOS Big Sur is both 11 and 10.16, depending on SDK that
+        # Python was compiled against.
+        if mac_ver and parse(mac_ver) < parse('10.16'):
+            param.marks.append(
+                pytest.mark.xfail(raises=subprocess.TimeoutExpired,
+                                  strict=True))
     elif param.values[0].get("QT_API") == "PySide2":
         param.marks.append(
             pytest.mark.xfail(raises=subprocess.CalledProcessError))
