From 382fed711cc6c618cd44f4e6f7f2a56b22a572d5 Mon Sep 17 00:00:00 2001 From: Mark Jordan Date: Sat, 14 Sep 2024 10:29:09 -0700 Subject: [PATCH] Fixup from last commit for compatibility with Python < 3.10. --- tests/unit_tests.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/unit_tests.py b/tests/unit_tests.py index 572cf12..219711a 100644 --- a/tests/unit_tests.py +++ b/tests/unit_tests.py @@ -5,7 +5,6 @@ import os from ruamel.yaml import YAML import collections -import glob import tempfile import unittest @@ -1616,24 +1615,26 @@ class TestFileIsUtf8(unittest.TestCase): def test_file_is_utf8(self): current_dir = os.path.dirname(os.path.abspath(__file__)) input_files_dir = os.path.join(current_dir, "assets", "file_is_utf8_test") - files_to_test = glob.glob("true_*.txt", root_dir=input_files_dir) + files_to_test = os.listdir(input_files_dir) for file_to_test in files_to_test: - is_utf8 = workbench_utils.file_is_utf8( - os.path.join(input_files_dir, file_to_test) - ) - self.assertEqual(is_utf8, True) + if file_to_test.startswith("true_"): + is_utf8 = workbench_utils.file_is_utf8( + os.path.join(input_files_dir, file_to_test) + ) + self.assertEqual(is_utf8, True) def test_file_is_not_utf8(self): current_dir = os.path.dirname(os.path.abspath(__file__)) input_files_dir = os.path.join(current_dir, "assets", "file_is_utf8_test") - files_to_test = glob.glob("false_*.txt", root_dir=input_files_dir) + files_to_test = os.listdir(input_files_dir) for file_to_test in files_to_test: - is_utf8 = workbench_utils.file_is_utf8( - os.path.join(input_files_dir, file_to_test) - ) - self.assertEqual(is_utf8, False) + if file_to_test.startswith("false_"): + is_utf8 = workbench_utils.file_is_utf8( + os.path.join(input_files_dir, file_to_test) + ) + self.assertEqual(is_utf8, False) if __name__ == "__main__":