Update/tidy test_rcparams.py and move mpl.rc to test_rcparams.rc.

memmett · memmett · commit 2430747e8b5a · 2012-08-12T10:03:20.000-04:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1050,6 +1050,7 @@ def tk_window_focus():
     'matplotlib.tests.test_dates',
     'matplotlib.tests.test_spines',
     'matplotlib.tests.test_image',
+    'matplotlib.tests.test_rcparams',
     'matplotlib.tests.test_simplification',
     'matplotlib.tests.test_mathtext',
     'matplotlib.tests.test_text',
diff --git a/lib/matplotlib/tests/mpl.rc b/lib/matplotlib/tests/mpl.rc
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -4,8 +4,8 @@
 mpl.rc('text', usetex=False)
 mpl.rc('lines', linewidth=22)
 
-fname = os.path.abspath(os.path.dirname(__file__)) + os.sep + 'mpl.rc'
-
+fname = os.path.join(os.path.dirname(__file__), 'test_rcparams.rc')
+  
 def test_rcparams():
 
     usetex = mpl.rcParams['text.usetex']
@@ -27,8 +27,11 @@ def test_rcparams():
     assert mpl.rcParams['lines.linewidth'] == linewidth
 
     # test rc_file
-    mpl.rc_file(fname)
-    assert mpl.rcParams['lines.linewidth'] == 33
+    try:
+        mpl.rc_file(fname)
+        assert mpl.rcParams['lines.linewidth'] == 33
+    finally:
+        mpl.rcParams['lines.linewidth'] = linewidth
     
 
 if __name__ == '__main__':
diff --git a/lib/matplotlib/tests/test_rcparams.rc b/lib/matplotlib/tests/test_rcparams.rc
@@ -0,0 +1,3 @@
+# this file is used by the tests in test_rcparams.py
+
+lines.linewidth: 33

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# this file is used by the tests in test_rcparams.py`
	`2`	`+`
	`3`	`+lines.linewidth: 33`