Add more non-BMP tests; fix test on Windows

python · vstinner · Jan 17, 2025 · Jan 9, 2025 · Jan 9, 2025 · Jan 16, 2025
commit f1c523207b24198548abb0ec349829403b4188a4
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
@@ -2135,6 +2135,10 @@ def test_set_name(self):
             # on Windows
             "x" * (limit - 1) + "\U0010FFFF",
             "x" * (limit - 2) + "\U0010FFFF" * 2,
+            "x" + "\U0001f40d" * limit,
+            "xx" + "\U0001f40d" * limit,
+            "xxx" + "\U0001f40d" * limit,
+            "xxxx" + "\U0001f40d" * limit,
         ]
         if os_helper.FS_NONASCII:
             tests.append(f"nonascii:{os_helper.FS_NONASCII}")
@@ -2162,11 +2166,18 @@ def work():
                 else:
                     expected = os.fsdecode(encoded)
             else:
-                expected = name[:truncate]
-                if ord(expected[-1]) > 0xFFFF:
-                    # truncate the last non-BMP character to omit a lone
-                    # surrogate character
-                    expected = expected[:-1]
+                size = 0
+                chars = []
+                for ch in name:
+                    if ord(ch) > 0xFFFF:
+                        size += 2
+                    else:
+                        size += 1
+                    if size > truncate:
+                        break
+                    chars.append(ch)
+                expected = ''.join(chars)
+
                 if '\0' in expected:
                     expected = expected.split('\0', 1)[0]