Allow multiple Noto font types

aitikgupta · tacaswell · commit b878d2b82ea4 · 2022-02-18T17:20:12.000-05:00
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -1,5 +1,6 @@
 import io
 import pathlib
+import warnings
 
 import numpy as np
 from numpy.testing import assert_array_almost_equal
@@ -355,12 +356,18 @@ def test_chunksize_toobig_chunks(chunk_limit_setup):
 
 @image_comparison(["font_fallback.png"])
 def test_font_fallback():
-    fp = fm.FontProperties(family=["Noto Sans CJK JP"])
+    fp = fm.FontProperties(family=["Noto Sans CJK SC", "Noto Sans CJK JP"])
     name = pathlib.Path(fm.findfont(fp)).name
     if name not in ("NotoSansCJKsc-Regular.otf", "NotoSansCJK-Regular.ttc"):
-        pytest.skip(f"Noto Sans CJK JP font may be missing, found: {name}")
+        pytest.skip(f"Noto Sans CJK SC font may be missing, found: {name}")
 
-    plt.rc('font', family=['DejaVu Sans', 'Noto Sans CJK JP'], size=15)
+    plt.rc('font', family=[
+        'DejaVu Sans', 'Noto Sans CJK JP', 'Noto Sans CJK SC'
+    ], size=15)
 
     fig, ax = plt.subplots()
     ax.text(0.25, 0.475, "There are 多个汉字 in between!")
+
+    with warnings.catch_warnings():
+        warnings.filterwarnings('ignore', 'findfont: Font family.*not found')
+        fig.canvas.draw()
