Merge pull request #14871 from anntzer/determinism

timhoffm · web-flow · commit 764cc4a71273 · 2019-08-08T23:03:06.000+02:00
Parametrize determinism tests.
diff --git a/doc/api/next_api_changes/2019-07-23-AL.rst b/doc/api/next_api_changes/2019-07-23-AL.rst
@@ -0,0 +1,5 @@
+API changes
+```````````
+
+The ``matplotlib.testing.determinism`` module, which exposes no public API, has
+been deleted.
diff --git a/lib/matplotlib/testing/determinism.py b/lib/matplotlib/testing/determinism.py
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -12,8 +12,6 @@
 from matplotlib.backends.backend_pdf import PdfPages
 from matplotlib.testing.compare import compare_images
 from matplotlib.testing.decorators import image_comparison
-from matplotlib.testing.determinism import (_determinism_source_date_epoch,
-                                            _determinism_check)
 
 
 with warnings.catch_warnings():
@@ -137,36 +135,6 @@ def test_pdfpages_fspath():
         pdf.savefig(plt.figure())
 
 
-def test_source_date_epoch():
-    """Test SOURCE_DATE_EPOCH support for PDF output"""
-    _determinism_source_date_epoch("pdf", b"/CreationDate (D:20000101000000Z)")
-
-
-def test_determinism_plain():
-    """Test for reproducible PDF output: simple figure"""
-    _determinism_check('', format="pdf")
-
-
-def test_determinism_images():
-    """Test for reproducible PDF output: figure with different images"""
-    _determinism_check('i', format="pdf")
-
-
-def test_determinism_hatches():
-    """Test for reproducible PDF output: figure with different hatches"""
-    _determinism_check('h', format="pdf")
-
-
-def test_determinism_markers():
-    """Test for reproducible PDF output: figure with different markers"""
-    _determinism_check('m', format="pdf")
-
-
-def test_determinism_all():
-    """Test for reproducible PDF output"""
-    _determinism_check(format="pdf")
-
-
 @image_comparison(['hatching_legend.pdf'])
 def test_hatching_legend():
     """Test for correct hatching on patches in legend"""
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -11,8 +11,6 @@
 import matplotlib.pyplot as plt
 from matplotlib import cbook, patheffects
 from matplotlib.testing.decorators import image_comparison
-from matplotlib.testing.determinism import (_determinism_source_date_epoch,
-                                            _determinism_check)
 
 
 with warnings.catch_warnings():
@@ -98,28 +96,6 @@ def test_tilde_in_tempfilename(tmpdir):
         plt.savefig(base_tempdir / 'tex_demo.eps', format="ps")
 
 
-def test_source_date_epoch():
-    """Test SOURCE_DATE_EPOCH support for PS output"""
-    # SOURCE_DATE_EPOCH support is not tested with text.usetex,
-    # because the produced timestamp comes from ghostscript:
-    # %%CreationDate: D:20000101000000Z00\'00\', and this could change
-    # with another ghostscript version.
-    _determinism_source_date_epoch(
-        "ps", b"%%CreationDate: Sat Jan 01 00:00:00 2000")
-
-
-def test_determinism_all():
-    """Test for reproducible PS output"""
-    _determinism_check(format="ps")
-
-
-@needs_usetex
-@needs_ghostscript
-def test_determinism_all_tex():
-    """Test for reproducible PS/tex output"""
-    _determinism_check(format="ps", usetex=True)
-
-
 @image_comparison(["empty.eps"])
 def test_transparency():
     fig, ax = plt.subplots()
diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
@@ -98,65 +98,6 @@ def test_bold_font_output_with_none_fonttype():
     ax.set_title('bold-title', fontweight='bold')
 
 
-def _test_determinism_save(filename, usetex):
-    # This function is mostly copy&paste from "def test_visibility"
-    mpl.rc('svg', hashsalt='asdf')
-    mpl.rc('text', usetex=usetex)
-
-    fig = Figure()  # Require no GUI.
-    ax = fig.add_subplot(111)
-
-    x = np.linspace(0, 4 * np.pi, 50)
-    y = np.sin(x)
-    yerr = np.ones_like(y)
-
-    a, b, c = ax.errorbar(x, y, yerr=yerr, fmt='ko')
-    for artist in b:
-        artist.set_visible(False)
-    ax.set_title('A string $1+2+\\sigma$')
-    ax.set_xlabel('A string $1+2+\\sigma$')
-    ax.set_ylabel('A string $1+2+\\sigma$')
-
-    fig.savefig(filename, format="svg")
-
-
-@pytest.mark.parametrize(
-    "filename, usetex",
-    # unique filenames to allow for parallel testing
-    [("determinism_notex.svg", False),
-     pytest.param("determinism_tex.svg", True, marks=needs_usetex)])
-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", force=True); '
-                 '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
-        else:
-            with open(filename, 'rb') as fd:
-                plots.append(fd.read())
-        finally:
-            os.unlink(filename)
-    for p in plots[1:]:
-        assert p == plots[0]
-
-
 @needs_usetex
 def test_missing_psfont(monkeypatch):
     """An error is raised if a TeX font lacks a Type-1 equivalent"""
diff --git a/lib/matplotlib/tests/test_determinism.py b/lib/matplotlib/tests/test_determinism.py
