Attempt to fix some failing tests

mdboom · mdboom · commit e38bb708cafd · 2013-08-30T13:30:12.000-04:00
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')
