Merge pull request #9487 from anntzer/determinism_tex-test

Kojoley · web-flow · commit 6798266241ff · 2017-10-20T17:11:06.000+03:00
Improve test_backend_svg.test_determinism.
diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
@@ -152,47 +152,43 @@ def _test_determinism_save(filename, usetex):
     FigureCanvasSVG(fig).print_svg(filename)
 
 
-def _test_determinism(filename, usetex):
+@pytest.mark.parametrize(
+    "filename, usetex",
+    # unique filenames to allow for parallel testing
+    [("determinism_notex.svg", False),
+     needs_usetex(("determinism_tex.svg", True))])
+def test_determinism(filename, usetex):
     import sys
     from subprocess import check_output, STDOUT, CalledProcessError
     plots = []
     for i in range(3):
         # Using check_output and setting stderr to STDOUT will capture the real
         # problem in the output property of the exception
         try:
-            check_output([sys.executable, '-R', '-c',
-                          'import matplotlib; '
-                          'matplotlib._called_from_pytest = True;'
-                          'matplotlib.use("svg"); '
-                          'from matplotlib.tests.test_backend_svg '
-                          'import _test_determinism_save;'
-                          '_test_determinism_save(%r, %r)' % (filename,
-                                                              usetex)],
-                         stderr=STDOUT)
+            check_output(
+                [sys.executable, '-R', '-c',
+                 'import matplotlib; '
+                 'matplotlib._called_from_pytest = True; '
+                 'matplotlib.use("svg"); '
+                 'from matplotlib.tests.test_backend_svg '
+                 'import _test_determinism_save;'
+                 '_test_determinism_save(%r, %r)' % (filename, usetex)],
+                stderr=STDOUT)
         except CalledProcessError as e:
             # it's easier to use utf8 and ask for forgiveness than try
             # to figure out what the current console has as an
             # encoding :-/
             print(e.output.decode(encoding="utf-8", errors="ignore"))
             raise e
-        with open(filename, 'rb') as fd:
-            plots.append(fd.read())
-        os.unlink(filename)
+        else:
+            with open(filename, 'rb') as fd:
+                plots.append(fd.read())
+        finally:
+            os.unlink(filename)
     for p in plots[1:]:
         assert p == plots[0]
 
 
-def test_determinism_notex():
-    # unique filename to allow for parallel testing
-    _test_determinism('determinism_notex.svg', usetex=False)
-
-
-@needs_usetex
-def test_determinism_tex():
-    # unique filename to allow for parallel testing
-    _test_determinism('determinism_tex.svg', usetex=True)
-
-
 @needs_usetex
 def test_missing_psfont(monkeypatch):
     """An error is raised if a TeX font lacks a Type-1 equivalent"""
