skip test_macostools when UCS4 is enabled

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index bad8136f5bf87f9823192667040e2217470e7469..29c165b121647dbf6e4eb8b522ca60176ad9f84f 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1133,6 +1133,9 @@ class _ExpectedSkips:
                             "test_applesingle"]
                 for skip in MAC_ONLY:
                     self.expected.add(skip)
+            elif len(u'\0'.encode('unicode-internal')) == 4:
+                self.expected.add("test_macostools")
+
 
             if sys.platform != "win32":
                 # test_sqlite is only reliable on Windows where the library

diff --git a/Lib/test/test_macostools.py b/Lib/test/test_macostools.py
index eea3601cf30454f5d597f579d5e7a91ac0ecda34..da982d0bacd70929deadaaa9d9dd8acb94bcec2a 100644 (file)
--- a/Lib/test/test_macostools.py
+++ b/Lib/test/test_macostools.py
@@ -91,6 +91,9 @@ class TestMacostools(unittest.TestCase):
 
 
 def test_main():
+    # Skip on wide unicode
+    if len(u'\0'.encode('unicode-internal')) == 4:
+        raise test_support.TestSkipped("test_macostools is broken in USC4")
     test_support.run_unittest(TestMacostools)