Fixed figures/baselines count mismatch

Kojoley · Kojoley · commit 626398dfb283 · 2016-09-16T13:25:25.000+03:00
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -16,6 +16,7 @@
 from matplotlib.image import imread
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 from matplotlib.figure import Figure
+from matplotlib.testing import skip
 from matplotlib.testing.decorators import (
     cleanup, image_comparison, knownfailureif)
 from matplotlib import pyplot as plt
@@ -251,7 +252,7 @@ def process_image(self, padded_src, dpi):
             return t2
 
     if V(np.__version__) < V('1.7.0'):
-        return
+        skip('Disabled on Numpy < 1.7.0')
 
     fig = plt.figure()
     ax = fig.add_subplot(111)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1266,7 +1266,7 @@ def test_hist2d_transpose():
     ax.hist2d(x, y, bins=10)
 
 
-@image_comparison(baseline_images=['scatter', 'scatter'])
+@image_comparison(baseline_images=['scatter'])
 def test_scatter_plot():
     ax = plt.axes()
     data = {"x": [3, 4, 2, 6], "y": [2, 5, 2, 3], "c": ['r', 'y', 'b', 'lime'],
@@ -1375,8 +1375,8 @@ def _as_mpl_axes(self):
 @image_comparison(baseline_images=['log_scales'])
 def test_log_scales():
     fig = plt.figure()
-    ax = plt.gca()
-    plt.plot(np.log(np.linspace(0.1, 100)))
+    ax = fig.add_subplot(1, 1, 1)
+    ax.plot(np.log(np.linspace(0.1, 100)))
     ax.set_yscale('log', basey=5.5)
     ax.invert_yaxis()
     ax.set_xscale('log', basex=9.0)
