bla

andrzejnovak · andrzejnovak · commit 4ccc0d43f3f2 · 2020-02-25T16:46:34.000+01:00
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -304,40 +304,19 @@ def test_mathtext_fallback_to_cm_invalid():
         mpl.rcParams['mathtext.fallback_to_cm'] = fallback
 
 
-def test_mathtext_fallback_cm():
-    mpl.font_manager.fontManager.addfont(
-        os.path.join((os.path.dirname(os.path.realpath(__file__))), 'mpltest.ttf'))
-    mpl.rcParams["svg.fonttype"] = 'none'
-    mpl.rcParams['mathtext.fontset'] = 'custom'
-    mpl.rcParams['mathtext.rm'] = 'mpltest'
-    mpl.rcParams['mathtext.it'] = 'mpltest:italic'
-    mpl.rcParams['mathtext.bf'] = 'mpltest:bold'
-    mpl.rcParams['mathtext.fallback'] = 'cm'
-
-    test_str = r'a$A\AA\breve\gimel$'
-
-    buff = io.BytesIO()
-    fig, ax = plt.subplots()
-    fig.text(.5, .5, test_str, fontsize=40, ha='center')
-    fig.savefig(buff, format="svg")
-    char_fonts = [
-        line.split("font-family:")[-1].split(";")[0]
-        for line in str(buff.getvalue()).split(r"\n") if "tspan" in line
-    ]
-    assert char_fonts == [
-        'DejaVu Sans', 'mpltest', 'STIXGeneral', 'cmr10', 'STIXGeneral'
-    ]
-
-
-def test_mathtext_fallback_stix():
+@pytest.mark.parametrize(
+    "fallback,fontlist",
+    [("cm", ['DejaVu Sans', 'mpltest', 'STIXGeneral', 'cmr10', 'STIXGeneral']),
+     ("stix", ['DejaVu Sans', 'mpltest', 'STIXGeneral'])])
+def test_mathtext_fallback_cm(fallback, fontlist):
     mpl.font_manager.fontManager.addfont(
         os.path.join((os.path.dirname(os.path.realpath(__file__))), 'mpltest.ttf'))
     mpl.rcParams["svg.fonttype"] = 'none'
     mpl.rcParams['mathtext.fontset'] = 'custom'
     mpl.rcParams['mathtext.rm'] = 'mpltest'
     mpl.rcParams['mathtext.it'] = 'mpltest:italic'
     mpl.rcParams['mathtext.bf'] = 'mpltest:bold'
-    mpl.rcParams['mathtext.fallback'] = 'stix'
+    mpl.rcParams['mathtext.fallback'] = fallback
 
     test_str = r'a$A\AA\breve\gimel$'
 
@@ -349,6 +328,5 @@ def test_mathtext_fallback_stix():
         line.split("font-family:")[-1].split(";")[0]
         for line in str(buff.getvalue()).split(r"\n") if "tspan" in line
     ]
-    assert char_fonts == [
-        'DejaVu Sans', 'mpltest', 'STIXGeneral'
-    ]
+    assert char_fonts == fontlist
+    mpl.font_manager.fontManager.ttflist = mpl.font_manager.fontManager.ttflist[:-1]
