Merge pull request #8846 from anntzer/test-cleanups

tacaswell · web-flow · commit c4e63882695e · 2017-07-08T15:45:37.000-04:00
TST: Minor cleanups for tests

 - remove `plt.show()`
 - prefer `fig.canvas.draw()` over `plt.draw()`
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -174,7 +174,7 @@ def test_contains():
 
     # draw the text. This is important, as the contains method can only work
     # when a renderer exists.
-    plt.draw()
+    fig.canvas.draw()
 
     for x, y in zip(xs.flat, ys.flat):
         mevent.x, mevent.y = plt.gca().transAxes.transform_point([x, y])
@@ -238,12 +238,12 @@ def test_set_position():
     # test set_position
     ann = ax.annotate(
         'test', (0, 0), xytext=(0, 0), textcoords='figure pixels')
-    plt.draw()
+    fig.canvas.draw()
 
     init_pos = ann.get_window_extent(fig.canvas.renderer)
     shift_val = 15
     ann.set_position((shift_val, shift_val))
-    plt.draw()
+    fig.canvas.draw()
     post_pos = ann.get_window_extent(fig.canvas.renderer)
 
     for a, b in zip(init_pos.min, post_pos.min):
@@ -252,12 +252,12 @@ def test_set_position():
     # test xyann
     ann = ax.annotate(
         'test', (0, 0), xytext=(0, 0), textcoords='figure pixels')
-    plt.draw()
+    fig.canvas.draw()
 
     init_pos = ann.get_window_extent(fig.canvas.renderer)
     shift_val = 15
     ann.xyann = (shift_val, shift_val)
-    plt.draw()
+    fig.canvas.draw()
     post_pos = ann.get_window_extent(fig.canvas.renderer)
 
     for a, b in zip(init_pos.min, post_pos.min):
@@ -396,7 +396,6 @@ def test_agg_text_clip():
     for x, y in np.random.rand(10, 2):
         ax1.text(x, y, "foo", clip_on=True)
         ax2.text(x, y, "foo")
-    plt.show()
 
 
 def test_text_size_binding():
diff --git a/tools/triage_tests.py b/tools/triage_tests.py
@@ -69,7 +69,7 @@ def __init__(self, parent, index, name):
         self.image = QtWidgets.QLabel()
         self.image.setAlignment(QtCore.Qt.AlignHCenter |
                                 QtCore.Qt.AlignVCenter)
-        self.image.setMinimumSize(800/3, 600/3)
+        self.image.setMinimumSize(800/3, 500/3)
         layout.addWidget(self.image)
         self.setLayout(layout)
 
@@ -139,7 +139,7 @@ def __init__(self, entries):
         self.image_display = QtWidgets.QLabel()
         self.image_display.setAlignment(QtCore.Qt.AlignHCenter |
                                         QtCore.Qt.AlignVCenter)
-        self.image_display.setMinimumSize(800, 600)
+        self.image_display.setMinimumSize(800, 500)
         images_layout.addWidget(thumbnails_box, 3)
         images_layout.addWidget(self.image_display, 6)
         images_box.setLayout(images_layout)
