Merge pull request #16933 from anntzer/toolmanager

QuLogic · web-flow · commit a96b83df14a3 · 2020-04-15T17:09:21.000-04:00
Add tests for toolmanager.
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -992,7 +992,7 @@ def _mouse_move(self, event):
 class ToolHelpBase(ToolBase):
     description = 'Print tool list, shortcuts and description'
     default_keymap = mpl.rcParams['keymap.help']
-    image = 'help.png'
+    image = 'help'
 
     @staticmethod
     def format_shortcut(key_sequence):
diff --git a/lib/matplotlib/mpl-data/images/help.gif b/lib/matplotlib/mpl-data/images/help.gif
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -1,5 +1,6 @@
 import importlib
 import importlib.util
+import json
 import os
 import signal
 import subprocess
@@ -60,6 +61,7 @@ def _get_testable_interactive_backends():
 _test_script = """\
 import importlib
 import importlib.util
+import json
 import sys
 from unittest import TestCase
 
@@ -70,6 +72,8 @@ def _get_testable_interactive_backends():
     "webagg.open_in_browser": False,
     "webagg.port_retries": 1,
 })
+if len(sys.argv) >= 2:  # Second argument is json-encoded rcParams.
+    rcParams.update(json.loads(sys.argv[1]))
 backend = plt.rcParams["backend"].lower()
 assert_equal = TestCase().assertEqual
 assert_raises = TestCase().assertRaises
@@ -122,10 +126,14 @@ def check_alt_backend(alt_backend):
 
 
 @pytest.mark.parametrize("backend", _get_testable_interactive_backends())
+@pytest.mark.parametrize("toolbar", ["toolbar2", "toolmanager"])
 @pytest.mark.flaky(reruns=3)
-def test_interactive_backend(backend):
+def test_interactive_backend(backend, toolbar):
+    if backend == "macosx" and toolbar == "toolmanager":
+        pytest.skip("toolmanager is not implemented for macosx.")
     proc = subprocess.run(
-        [sys.executable, "-c", _test_script],
+        [sys.executable, "-c", _test_script,
+         json.dumps({"toolbar": toolbar})],
         env={**os.environ, "MPLBACKEND": backend}, timeout=_test_timeout,
         stdout=subprocess.PIPE, universal_newlines=True)
     if proc.returncode:
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -92,7 +92,7 @@
 #backend_fallback: True
 
 #interactive: False
-#toolbar:     toolbar2  # {None, toolbar2}
+#toolbar:     toolbar2  # {None, toolbar2, toolmanager}
 #timezone:    UTC       # a pytz timezone string, e.g., US/Central or Europe/Paris
 
 
