Merge pull request #10215 from anntzer/more-interactive-tests

jklymak · web-flow · commit 4ac125e6f221 · 2018-04-04T09:40:29.000-07:00
Test timers and (a bit) key_press_event for interactive backends.
diff --git a/.travis.yml b/.travis.yml
@@ -48,6 +48,7 @@ env:
     - secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
     - secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
     - secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
+    # Variables controlling Python dependencies.
     - CYCLER=cycler
     - DATEUTIL=python-dateutil
     - NOSE=
@@ -58,12 +59,15 @@ env:
     - PYTEST_COV=pytest-cov
     - PYTEST_PEP8=
     - SPHINX=sphinx
-    - OPENBLAS_NUM_THREADS=1
+    # Variables controlling the test run.
+    - DELETE_FONT_CACHE=
+    - NO_AT_BRIDGE=1  # Necessary for GTK3 interactive test.
     - NPROC=2
-    - RUN_PEP8=
+    - OPENBLAS_NUM_THREADS=1
+    - PYTHONFAULTHANDLER=1
     - PYTEST_ARGS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
     - PYTHON_ARGS=
-    - DELETE_FONT_CACHE=
+    - RUN_PEP8=
 
 matrix:
   include:
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -667,9 +667,6 @@ def __init__(self, parent, id, figure):
     def macros(self):
         return {}
 
-    def Destroy(self, *args, **kwargs):
-        wx.Panel.Destroy(self, *args, **kwargs)
-
     def Copy_to_Clipboard(self, event=None):
         "copy bitmap of canvas to system clipboard"
         bmp_obj = wx.BitmapDataObject()
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -34,6 +34,13 @@ def _get_testable_interactive_backends():
     return backends
 
 
+# 1. Using a timer not only allows testing of timers (on other backends), but
+#    is also necessary on gtk3 and wx, where a direct call to
+#    key_press_event("q") from draw_event causes breakage due to the canvas
+#    widget being deleted too early.
+# 2. On gtk3, we cannot even test the timer setup (on Travis, which uses pgi)
+#    due to https://github.com/pygobject/pgi/issues/45.  So we just cleanly
+#    exit from the draw_event.
 _test_script = """\
 import sys
 from matplotlib import pyplot as plt, rcParams
@@ -44,8 +51,16 @@ def _get_testable_interactive_backends():
 
 fig = plt.figure()
 ax = fig.add_subplot(111)
-ax.plot([1, 2], [2, 3])
-fig.canvas.mpl_connect("draw_event", lambda event: sys.exit())
+ax.plot([0, 1], [2, 3])
+
+if rcParams["backend"].startswith("GTK3"):
+    fig.canvas.mpl_connect("draw_event", lambda event: sys.exit(0))
+else:
+    timer = fig.canvas.new_timer(1)
+    timer.add_callback(fig.canvas.key_press_event, "q")
+    # Trigger quitting upon draw.
+    fig.canvas.mpl_connect("draw_event", lambda event: timer.start())
+
 plt.show()
 """
 _test_timeout = 10  # Empirically, 1s is not enough on Travis.
