From c011ec445e90f07175a36128da84c3fea9d4f569 Mon Sep 17 00:00:00 2001 From: Ankith <46915066+ankith26@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:49:05 +0530 Subject: [PATCH 1/3] Try getting freetype tests running on CI --- test/freetype_test.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/freetype_test.py b/test/freetype_test.py index 2eab183143..963411e35d 100644 --- a/test/freetype_test.py +++ b/test/freetype_test.py @@ -1,8 +1,5 @@ import os -if os.environ.get("SDL_VIDEODRIVER") == "dummy": - __tags__ = ("ignore", "subprocess_ignore") - import unittest import ctypes import weakref From 03606742e7114cb6a38f7680dc6dad3b33a1f5aa Mon Sep 17 00:00:00 2001 From: Ankith <46915066+ankith26@users.noreply.github.com> Date: Tue, 1 Aug 2023 23:16:44 +0530 Subject: [PATCH 2/3] update test in freetype to error for nullfont name --- test/freetype_test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/freetype_test.py b/test/freetype_test.py index 963411e35d..65fa395db0 100644 --- a/test/freetype_test.py +++ b/test/freetype_test.py @@ -544,8 +544,7 @@ def test_freetype_Font_name(self): f = self._TEST_FONTS["fixed"] self.assertEqual(f.name, "Inconsolata") - nf = nullfont() - self.assertEqual(nf.name, repr(nf)) + self.assertRaises(AttributeError, lambda: nullfont().name) def test_freetype_Font_size(self): f = ft.Font(None, size=12) From 2cd43ecd0202865546b8821a44b97be1cfac37e8 Mon Sep 17 00:00:00 2001 From: Ankith <46915066+ankith26@users.noreply.github.com> Date: Tue, 1 Aug 2023 23:37:59 +0530 Subject: [PATCH 3/3] Fix a test in case there aren't enough sysfonts --- test/freetype_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/freetype_test.py b/test/freetype_test.py index 65fa395db0..c059e26250 100644 --- a/test/freetype_test.py +++ b/test/freetype_test.py @@ -1689,7 +1689,7 @@ def test_freetype_SysFont_name(self): self.assertEqual(font_name_2, font_name) # Check mixed list of bytes and string. - names = [fonts[0], fonts_b[1], fonts[2], fonts_b[3]] + names = [fonts_b[i] if i % 2 else str_font for i, str_font in enumerate(fonts)] font_name_2 = ft.SysFont(names, size).name self.assertEqual(font_name_2, font_name)