TST: Update contour test result images.

These changes are intended, with better selection of contour levels, cf. matplotlib/matplotlib#11412.
SciTools · Sep 26, 2018 · 6fe3c4c · 6fe3c4c
1 parent 1bf2c97
commit 6fe3c4c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/...topy/tests/mpl/baseline_images/mpl/test_mpl_integration/global_contour_wrap.png b/...topy/tests/mpl/baseline_images/mpl/test_mpl_integration/global_contour_wrap.png
diff --git a/.../baseline_images/mpl/test_mpl_integration/global_contour_wrap_mpl_pre_3.0.0.png b/.../baseline_images/mpl/test_mpl_integration/global_contour_wrap_mpl_pre_3.0.0.png
diff --git a/lib/cartopy/tests/mpl/test_mpl_integration.py b/lib/cartopy/tests/mpl/test_mpl_integration.py
@@ -34,16 +34,19 @@
 _ROB_TOL = 0.5 if ccrs.PROJ4_VERSION < (4, 9) else 0.111
 if MPL_VERSION >= '3.0.0':
     _STREAMPLOT_IMAGE = 'streamplot_mpl_3.0.0'
-elif MPL_VERSION >= '2.1.0':
-    _STREAMPLOT_IMAGE = 'streamplot_mpl_2.1.0'
-elif MPL_VERSION >= '2':
-    _STREAMPLOT_IMAGE = 'streamplot_mpl_2.0.0'
+    _CONTOUR_IMAGE = 'global_contour_wrap'
 else:
-    _STREAMPLOT_IMAGE = 'streamplot_mpl_1.4.3'
+    _CONTOUR_IMAGE = 'global_contour_wrap_mpl_pre_3.0.0'
+    if MPL_VERSION >= '2.1.0':
+        _STREAMPLOT_IMAGE = 'streamplot_mpl_2.1.0'
+    elif MPL_VERSION >= '2':
+        _STREAMPLOT_IMAGE = 'streamplot_mpl_2.0.0'
+    else:
+        _STREAMPLOT_IMAGE = 'streamplot_mpl_1.4.3'
 
 
 @pytest.mark.natural_earth
-@ImageTesting(['global_contour_wrap'])
+@ImageTesting([_CONTOUR_IMAGE])
 def test_global_contour_wrap_new_transform():
     ax = plt.axes(projection=ccrs.PlateCarree())
     ax.coastlines()
@@ -53,7 +56,7 @@ def test_global_contour_wrap_new_transform():
 
 
 @pytest.mark.natural_earth
-@ImageTesting(['global_contour_wrap'])
+@ImageTesting([_CONTOUR_IMAGE])
 def test_global_contour_wrap_no_transform():
     ax = plt.axes(projection=ccrs.PlateCarree())
     ax.coastlines()