Investigate test failures.

anntzer · anntzer · commit 33aa68c38c67 · 2017-11-17T20:06:02.000-08:00
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -3,10 +3,12 @@
 
 import six
 
+from collections import OrderedDict
+import copy
 import io
+from itertools import chain
 import os
 import warnings
-from collections import OrderedDict
 
 from cycler import cycler, Cycler
 import pytest
@@ -18,7 +20,6 @@
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 import matplotlib.colors as mcolors
-from itertools import chain
 import numpy as np
 from matplotlib.rcsetup import (validate_bool_maybe_none,
                                 validate_stringlist,
@@ -33,15 +34,17 @@
                                 _validate_linestyle)
 
 
-mpl.rc('text', usetex=False)
-mpl.rc('lines', linewidth=22)
-
-fname = os.path.join(os.path.dirname(__file__), 'test_rcparams.rc')
+@pytest.fixture(autouse=True)
+def setup_module():
+    with mpl.rc_context():
+        mpl.rc('text', usetex=False)
+        mpl.rc('lines', linewidth=22)
 
 
 def test_rcparams():
     usetex = mpl.rcParams['text.usetex']
     linewidth = mpl.rcParams['lines.linewidth']
+    fname = os.path.join(os.path.dirname(__file__), 'test_rcparams.rc')
 
     # test context given dictionary
     with mpl.rc_context(rc={'text.usetex': not usetex}):
@@ -59,9 +62,8 @@ def test_rcparams():
     assert mpl.rcParams['lines.linewidth'] == linewidth
 
     # test rc_file
-    with mpl.rc_context():
-        mpl.rc_file(fname)
-        assert mpl.rcParams['lines.linewidth'] == 33
+    mpl.rc_file(fname)
+    assert mpl.rcParams['lines.linewidth'] == 33
 
 
 def test_RcParams_class():
@@ -154,8 +156,7 @@ def test_Bug_2543():
                 mpl.rcParams[key] = _copy[key]
             mpl.rcParams['text.dvipnghack'] = None
         with mpl.rc_context():
-            from copy import deepcopy
-            _deep_copy = deepcopy(mpl.rcParams)
+            _deep_copy = copy.deepcopy(mpl.rcParams)
         # real test is that this does not raise
         assert validate_bool_maybe_none(None) is None
         assert validate_bool_maybe_none("none") is None
