Merge pull request #2367 from mdboom/fix-failing-tests

pelson · pelson · commit 35a1b69c4dcf · 2013-09-03T08:46:39.000-07:00
Fix a number of long-failing tests.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1048,6 +1048,7 @@ def rcdefaults():
     the rc file, but mpl's internal params.  See rc_file_defaults for
     reloading the default params from the rc file
     """
+    rcParams.clear()
     rcParams.update(rcParamsDefault)
 
 
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -12,12 +12,13 @@ def test_use14corefonts():
         rcParams['font.family'] = 'sans-serif'
         rcParams['font.size'] = 8
         rcParams['font.sans-serif'] = ['Helvetica']
+        rcParams['pdf.compression'] = 0
 
         title = u'Test PDF backend with option use14corefonts=True'
 
         text = u'''A three-line text positioned just above a blue line
-        and containing some French characters and the euro symbol:
-        "Merci pépé pour les 10 €"'''
+    and containing some French characters and the euro symbol:
+    "Merci pépé pour les 10 €"'''
 
         plt.figure()
         plt.title(title)
diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py
@@ -1,4 +1,4 @@
-from matplotlib import rcParams, rcParamsDefault
+from matplotlib import rcParams
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.pyplot as plt
 import matplotlib.path as mpath
@@ -10,8 +10,6 @@
                   savefig_kwarg=dict(bbox_inches='tight'), tol=15)
 def test_bbox_inches_tight():
     "Test that a figure saved using bbox_inches'tight' is clipped right"
-    rcParams.update(rcParamsDefault)
-
     data = [[  66386,  174296,   75131,  577908,   32015],
             [  58230,  381139,   78045,   99308,  160454],
             [  89135,   80552,  152558,  497981,  603535],
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -3,7 +3,7 @@
 import matplotlib
 from matplotlib.testing.decorators import image_comparison, knownfailureif
 import matplotlib.pyplot as plt
-from matplotlib import rcParams, rcParamsDefault
+from matplotlib import rcParams
 from matplotlib.colors import BoundaryNorm
 from matplotlib.cm import get_cmap
 from matplotlib.colorbar import ColorbarBase
@@ -98,8 +98,6 @@ def _colorbar_extension_length(spacing):
         extensions=['png'])
 def test_colorbar_extension_shape():
     '''Test rectangular colorbar extensions.'''
-    # Use default params so matplotlibrc doesn't cause the test to fail.
-    rcParams.update(rcParamsDefault)
     # Create figures for uniform and proportionally spaced colorbars.
     fig1 = _colorbar_extension_shape('uniform')
     fig2 = _colorbar_extension_shape('proportional')
@@ -110,8 +108,6 @@ def test_colorbar_extension_shape():
                   extensions=['png'])
 def test_colorbar_extension_length():
     '''Test variable length colorbar extensions.'''
-    # Use default params so matplotlibrc doesn't cause the test to fail.
-    rcParams.update(rcParamsDefault)
     # Create figures for uniform and proportionally spaced colorbars.
     fig1 = _colorbar_extension_length('uniform')
     fig2 = _colorbar_extension_length('proportional')
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -264,7 +264,7 @@ def test_image_composite_alpha():
     ax.set_ylim([5, 0])
 
 
-@image_comparison(baseline_images=['rasterize_10dpi'], extensions=['pdf','svg'], tol=1.5e-3, remove_text=True)
+@image_comparison(baseline_images=['rasterize_10dpi'], extensions=['pdf','svg'], tol=1.5e-2, remove_text=True)
 def test_rasterize_dpi():
     # This test should check rasterized rendering with high output resolution.
     # It plots a rasterized line and a normal image with implot. So it will catch
