From 179885bd9a442bc171e562a8997abde2824997fa Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 31 Mar 2018 00:33:37 -0400 Subject: [PATCH 3/3] Increase some tolerances for non-x86 arches. Signed-off-by: Elliott Sales de Andrade --- lib/matplotlib/tests/test_arrow_patches.py | 4 ++-- lib/matplotlib/tests/test_axes.py | 6 +++--- lib/matplotlib/tests/test_backends_interactive.py | 2 +- lib/matplotlib/tests/test_collections.py | 2 +- lib/matplotlib/tests/test_constrainedlayout.py | 2 +- lib/matplotlib/tests/test_cycles.py | 6 +++--- lib/matplotlib/tests/test_figure.py | 2 +- lib/matplotlib/tests/test_image.py | 2 +- lib/matplotlib/tests/test_legend.py | 6 +++--- lib/matplotlib/tests/test_pickle.py | 2 +- lib/matplotlib/tests/test_scale.py | 2 +- lib/matplotlib/tests/test_streamplot.py | 2 +- lib/matplotlib/tests/test_units.py | 4 ++-- .../tests/test_axisartist_grid_helper_curvelinear.py | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py index f678fbed3..bac0cb802 100644 --- a/lib/matplotlib/tests/test_arrow_patches.py +++ b/lib/matplotlib/tests/test_arrow_patches.py @@ -69,7 +69,7 @@ def __prepare_fancyarrow_dpi_cor_test(): @image_comparison(baseline_images=['fancyarrow_dpi_cor_100dpi'], remove_text=True, extensions=['png'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.016, savefig_kwarg=dict(dpi=100)) def test_fancyarrow_dpi_cor_100dpi(): """ @@ -85,7 +85,7 @@ def test_fancyarrow_dpi_cor_100dpi(): @image_comparison(baseline_images=['fancyarrow_dpi_cor_200dpi'], remove_text=True, extensions=['png'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.019, savefig_kwarg=dict(dpi=200)) def test_fancyarrow_dpi_cor_200dpi(): """ diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index c0e0e560d..0021bbda4 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -387,7 +387,7 @@ def test_annotate_default_arrow(): assert ann.arrow_patch is not None -@image_comparison(baseline_images=['polar_axes'], style='default') +@image_comparison(baseline_images=['polar_axes'], style='default', tol=0.01) def test_polar_annotations(): # you can specify the xypoint and the xytext in different # positions and coordinate systems, and optionally turn on a @@ -3370,7 +3370,7 @@ def test_vertex_markers(): @image_comparison(baseline_images=['vline_hline_zorder', 'errorbar_zorder'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) + tol=0.02) def test_eb_line_zorder(): x = list(range(10)) @@ -5142,7 +5142,7 @@ def test_title_location_roundtrip(): @image_comparison(baseline_images=["loglog"], remove_text=True, extensions=['png'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) + tol=0.009) def test_loglog(): fig, ax = plt.subplots() x = np.arange(1, 11) diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py index 00cbf5db9..33e6fb21a 100644 --- a/lib/matplotlib/tests/test_backends_interactive.py +++ b/lib/matplotlib/tests/test_backends_interactive.py @@ -105,7 +105,7 @@ fig.canvas.mpl_connect("draw_event", lambda event: timer.start()) plt.show() """ -_test_timeout = 10 # Empirically, 1s is not enough on Travis. +_test_timeout = 30 # Empirically, 1s is not enough on Travis. @pytest.mark.parametrize("backend", _get_testable_interactive_backends()) diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py index 6812ee1ad..582aabb5c 100644 --- a/lib/matplotlib/tests/test_collections.py +++ b/lib/matplotlib/tests/test_collections.py @@ -442,7 +442,7 @@ def test_barb_limits(): @image_comparison(baseline_images=['EllipseCollection_test_image'], extensions=['png'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.012, remove_text=True) def test_EllipseCollection(): # Test basic functionality diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py index de8161ea7..2af2d6a42 100644 --- a/lib/matplotlib/tests/test_constrainedlayout.py +++ b/lib/matplotlib/tests/test_constrainedlayout.py @@ -173,7 +173,7 @@ def test_constrained_layout9(): @image_comparison(baseline_images=['constrained_layout10'], - extensions=['png']) + extensions=['png'], tol=0.01) def test_constrained_layout10(): 'Test for handling legend outside axis' fig, axs = plt.subplots(2, 2, constrained_layout=True) diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py index 8184d3eee..73b0f216d 100644 --- a/lib/matplotlib/tests/test_cycles.py +++ b/lib/matplotlib/tests/test_cycles.py @@ -10,7 +10,7 @@ from cycler import cycler @image_comparison(baseline_images=['color_cycle_basic'], remove_text=True, - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.008, extensions=['png']) def test_colorcycle_basic(): fig, ax = plt.subplots() @@ -28,7 +28,7 @@ def test_colorcycle_basic(): @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.008, remove_text=True, extensions=['png']) def test_marker_cycle(): fig, ax = plt.subplots() @@ -62,7 +62,7 @@ def test_marker_cycle(): @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True, - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.009, extensions=['png']) def test_linestylecycle_basic(): fig, ax = plt.subplots() diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py index 4c688eb05..63f562770 100644 --- a/lib/matplotlib/tests/test_figure.py +++ b/lib/matplotlib/tests/test_figure.py @@ -14,7 +14,7 @@ import pytest @image_comparison(baseline_images=['figure_align_labels'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) + tol=0.01) def test_align_labels(): # Check the figure.align_labels() command fig = plt.figure(tight_layout=True) diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index c0ffc061a..ca15df113 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -766,7 +766,7 @@ def test_imshow_endianess(): @image_comparison(baseline_images=['imshow_masked_interpolation'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.006, remove_text=True, style='mpl20') def test_imshow_masked_interpolation(): diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py index d508d6f41..9147ef336 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -108,7 +108,7 @@ def test_multiple_keys(): @image_comparison(baseline_images=['rgba_alpha'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.007, extensions=['png'], remove_text=True) def test_alpha_rgba(): import matplotlib.pyplot as plt @@ -120,7 +120,7 @@ def test_alpha_rgba(): @image_comparison(baseline_images=['rcparam_alpha'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.007, extensions=['png'], remove_text=True) def test_alpha_rcparam(): import matplotlib.pyplot as plt @@ -149,7 +149,7 @@ def test_fancy(): @image_comparison(baseline_images=['framealpha'], remove_text=True, - tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) + tol=0.018) def test_framealpha(): x = np.linspace(1, 100, 100) y = x diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py index 9cb806c6f..91774abfd 100644 --- a/lib/matplotlib/tests/test_pickle.py +++ b/lib/matplotlib/tests/test_pickle.py @@ -44,7 +44,7 @@ def test_simple(): @image_comparison(baseline_images=['multi_pickle'], extensions=['png'], remove_text=True, - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.004, style='mpl20') def test_complete(): fig = plt.figure('Figure with a label?', figsize=(10, 6)) diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py index ebe5c4de9..2999b624d 100644 --- a/lib/matplotlib/tests/test_scale.py +++ b/lib/matplotlib/tests/test_scale.py @@ -99,7 +99,7 @@ def test_logscale_transform_repr(): @image_comparison(baseline_images=['logscale_nonpos_values'], remove_text=True, - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.008, extensions=['png'], style='mpl20') def test_logscale_nonpos_values(): np.random.seed(19680801) diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py index e261513df..c8c8faf99 100644 --- a/lib/matplotlib/tests/test_streamplot.py +++ b/lib/matplotlib/tests/test_streamplot.py @@ -49,7 +49,7 @@ def test_colormap(): @image_comparison(baseline_images=['streamplot_linewidth'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.002, remove_text=True, style='mpl20') def test_linewidth(): X, Y, U, V = velocity_field() diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py index fec498af3..12a8d8a3e 100644 --- a/lib/matplotlib/tests/test_units.py +++ b/lib/matplotlib/tests/test_units.py @@ -75,7 +75,7 @@ def quantity_converter(): # Tests that the conversion machinery works properly for classes that # work as a facade over numpy arrays (like pint) @image_comparison(baseline_images=['plot_pint'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.003, extensions=['png'], remove_text=False, style='mpl20') def test_numpy_facade(quantity_converter): # Register the class @@ -100,7 +100,7 @@ def test_numpy_facade(quantity_converter): # Tests gh-8908 @image_comparison(baseline_images=['plot_masked_units'], - tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + tol=0.007, extensions=['png'], remove_text=True, style='mpl20') def test_plot_masked_units(): data = np.linspace(-5, 5) diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py index 32e1c884d..741d197b5 100644 --- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py +++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py @@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \ @image_comparison(baseline_images=['custom_transform'], - extensions=['png'], style='default', tol=0.03) + extensions=['png'], style='default', tol=0.04) def test_custom_transform(): class MyTransform(Transform): input_dims = 2 @@ -85,7 +85,7 @@ def test_custom_transform(): @image_comparison(baseline_images=['polar_box'], - tol={'aarch64': 0.04}.get(platform.machine(), 0.03), + tol=0.04, extensions=['png'], style='default') def test_polar_box(): fig = plt.figure(figsize=(5, 5)) -- 2.20.1