Backport PR #12036: Interactive tests update

NelleV · MeeseeksDev[bot] · commit 10c7cdc11a16 · 2018-09-07T18:43:08.000Z
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -17,22 +17,21 @@
 
 def _get_testable_interactive_backends():
     backends = []
-    # gtk3agg fails on Travis, needs to be investigated.
-    for deps, backend in [  # (["cairocffi", "pgi"], "gtk3agg"),
-                          (["cairocffi", "pgi"], "gtk3cairo"),
-                          (["PyQt5"], "qt5agg"),
-                          (["PyQt5", "cariocffi"], "qt5cairo"),
-                          (["tkinter"], "tkagg"),
-                          (["wx"], "wx"),
-                          (["wx"], "wxagg")
+    for deps, backend in [
+            # gtk3agg fails on Travis, needs to be investigated.
+            # (["cairocffi", "pgi"], "gtk3agg"),
+            (["cairocffi", "pgi"], "gtk3cairo"),
+            (["PyQt5"], "qt5agg"),
+            (["PyQt5", "cairocffi"], "qt5cairo"),
+            (["tkinter"], "tkagg"),
+            (["wx"], "wx"),
+            (["wx"], "wxagg"),
     ]:
         reason = None
         if not os.environ.get("DISPLAY"):
             reason = "No $DISPLAY"
         elif any(importlib.util.find_spec(dep) is None for dep in deps):
             reason = "Missing dependency"
-        elif "wx" in deps and sys.platform == "darwin":
-            reason = "wx backends known not to work on OSX"
         backends.append(pytest.mark.skip(reason=reason)(backend) if reason
                         else backend)
     return backends
@@ -67,9 +66,9 @@ def _get_testable_interactive_backends():
     # framework, but can switch to a backend using cairo instead of agg, or a
     # non-interactive backend.  In the first case, we use tkagg as the "other"
     # interactive backend as it is (essentially) guaranteed to be present.
-    # Moreover, don't test switching away from gtk3 as Gtk.main_level() is
-    # not set up at this point yet, and webagg, which uses no interactive
-    # framework.
+    # Moreover, don't test switching away from gtk3 (as Gtk.main_level() is
+    # not set up at this point yet) and webagg (which uses no interactive
+    # framework).
 
     if backend != "tkagg":
         with assert_raises(ImportError):
