Blob Blame History Raw
From 95dc2e69ced6d28d1a9490603f860a060765dfdb Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Mon, 26 Feb 2018 02:42:50 -0500
Subject: [PATCH] Increase tolerance for new FreeType.

Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
 lib/cartopy/tests/mpl/test_examples.py  | 2 +-
 lib/cartopy/tests/mpl/test_gridliner.py | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/cartopy/tests/mpl/test_examples.py b/lib/cartopy/tests/mpl/test_examples.py
index 71c15453..e3ab3660 100644
--- a/lib/cartopy/tests/mpl/test_examples.py
+++ b/lib/cartopy/tests/mpl/test_examples.py
@@ -56,7 +56,7 @@ elif MPL_VERSION <= '2.0.2':
 elif MPL_VERSION <= '2.1.2':
     contour_labels_tolerance = 0.63
 else:
-    contour_labels_tolerance = 0
+    contour_labels_tolerance = 9.8
 
 
 @pytest.mark.natural_earth
diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py
index 80c40c6c..5724e939 100644
--- a/lib/cartopy/tests/mpl/test_gridliner.py
+++ b/lib/cartopy/tests/mpl/test_gridliner.py
@@ -165,6 +165,11 @@ elif (6, 0, 0) <= ccrs.PROJ4_VERSION:
     # Better Robinson projection causes some text movement.
     grid_label_inline_tol += 1.2
 
+# Force higher tolerance due to new FreeType on Fedora.
+grid_label_tol = 15
+grid_label_inline_tol = 10.2
+grid_label_inline_usa_tol = 11.5
+
 
 @pytest.mark.natural_earth
 @ImageTesting([grid_label_image], tolerance=grid_label_tol)
-- 
2.21.1