Skip to content

Commit f9f03d6

Browse files
committed
TST: be more forgiving about IDing noto
1 parent 133f797 commit f9f03d6

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

lib/matplotlib/tests/test_ft2font.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ def test_fallback_smoke():
5656

5757

5858
@pytest.mark.parametrize('family_name, file_name',
59-
[("WenQuanYi Zen Hei", "wqy-zenhei.ttc"),
60-
("Noto Sans CJK JP", "NotoSansCJK-Regular.ttc")]
59+
[("WenQuanYi Zen Hei", "wqy-zenhei"),
60+
("Noto Sans CJK JP", "NotoSansCJK")]
6161
)
6262
@check_figures_equal(extensions=["png", "pdf", "eps", "svg"])
6363
def test_font_fallback_chinese(fig_test, fig_ref, family_name, file_name):
6464
fp = fm.FontProperties(family=[family_name])
65-
if Path(fm.findfont(fp)).name != file_name:
65+
if file_name not in Path(fm.findfont(fp)).name:
6666
pytest.skip(f"Font {family_name} ({file_name}) is missing")
6767

6868
text = ["There are", "几个汉字", "in between!"]
@@ -81,13 +81,14 @@ def test_font_fallback_chinese(fig_test, fig_ref, family_name, file_name):
8181
@pytest.mark.parametrize(
8282
"family_name, file_name",
8383
[
84-
("WenQuanYi Zen Hei", "wqy-zenhei.ttc"),
85-
("Noto Sans CJK JP", "NotoSansCJK-Regular.ttc"),
84+
("WenQuanYi Zen Hei", "wqy-zenhei"),
85+
("Noto Sans CJK JP", "NotoSansCJK"),
8686
],
8787
)
8888
def test__get_fontmap(family_name, file_name):
8989
fp = fm.FontProperties(family=[family_name])
90-
if Path(fm.findfont(fp)).name != file_name:
90+
found_file_name = Path(fm.findfont(fp)).name
91+
if file_name not in found_file_name:
9192
pytest.skip(f"Font {family_name} ({file_name}) is missing")
9293

9394
text = "There are 几个汉字 in between!"
@@ -100,6 +101,6 @@ def test__get_fontmap(family_name, file_name):
100101
fontmap = ft._get_fontmap(text)
101102
for char, font in fontmap.items():
102103
if ord(char) > 127:
103-
assert Path(font.fname).name == file_name
104+
assert Path(font.fname).name == found_file_name
104105
else:
105106
assert Path(font.fname).name == "DejaVuSans.ttf"

0 commit comments

Comments
 (0)