Merge pull request #6918 from jenshnielsen/addtestusetextodefaulttests

tacaswell · web-flow · commit af16ac8db46d · 2016-08-30T17:13:54.000-04:00
TST: enable previously leftout test_usetex
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1544,6 +1544,7 @@ def _jupyter_nbextension_paths():
     'matplotlib.tests.test_type1font',
     'matplotlib.tests.test_ttconv',
     'matplotlib.tests.test_units',
+    'matplotlib.tests.test_usetex',
     'matplotlib.tests.test_widgets',
     'matplotlib.tests.test_cycles',
     'matplotlib.tests.test_preprocess_data',
diff --git a/lib/matplotlib/tests/baseline_images/test_usetex/test_usetex.png b/lib/matplotlib/tests/baseline_images/test_usetex/test_usetex.png
diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
@@ -3,11 +3,18 @@
 
 import matplotlib
 from matplotlib.testing.decorators import image_comparison
+from matplotlib.compat.subprocess import check_output
 import matplotlib.pyplot as plt
 
 
-@image_comparison(baseline_images=['test_usetex'], extensions=['pdf', 'png'])
+@image_comparison(baseline_images=['test_usetex'],
+                  extensions=['pdf', 'png'],
+                  tol=0.3)
 def test_usetex():
+    canusetex = matplotlib.checkdep_usetex(True)
+    if not canusetex:
+        from nose import SkipTest
+        raise SkipTest('Cannot run usetex_test')
     matplotlib.rcParams['text.usetex'] = True
     fig = plt.figure()
     ax = fig.add_subplot(111)
@@ -16,7 +23,7 @@ def test_usetex():
             # \left[ ... \right\} draw some variable-height characters,
             # \sqrt and \frac draw horizontal rules, \mathrm changes the font
             r'\LaTeX\ $\left[\int\limits_e^{2e}'
-            r'\sqrt\frac{\log^3 x}{x}\,\mathrm{d}x \right\}',
+            r'\sqrt\frac{\log^3 x}{x}\,\mathrm{d}x \right\}$',
             fontsize=24)
     ax.set_xticks([])
     ax.set_yticks([])
