From 111ece3a520d80c97fc5a20e489152e822a5bc90 Mon Sep 17 00:00:00 2001 From: sweeneyde Date: Tue, 17 May 2022 00:03:30 -0400 Subject: [PATCH] Update unicode struct size to ensure MemError is raised --- Lib/test/test_unicode.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index c98fabf8bc9b5a..64abc0c761b3c8 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -2370,14 +2370,9 @@ def test_expandtabs_optimization(self): self.assertIs(s.expandtabs(), s) def test_raiseMemError(self): - if struct.calcsize('P') == 8: - # 64 bits pointers - ascii_struct_size = 48 - compact_struct_size = 72 - else: - # 32 bits pointers - ascii_struct_size = 24 - compact_struct_size = 36 + null_byte = 1 + ascii_struct_size = sys.getsizeof("a") - len("a") - null_byte + compact_struct_size = sys.getsizeof("\xff") - len("\xff") - null_byte for char in ('a', '\xe9', '\u20ac', '\U0010ffff'): code = ord(char) @@ -2395,8 +2390,9 @@ def test_raiseMemError(self): # be allocatable, given enough memory. maxlen = ((sys.maxsize - struct_size) // char_size) alloc = lambda: char * maxlen - self.assertRaises(MemoryError, alloc) - self.assertRaises(MemoryError, alloc) + with self.subTest(char=char): + self.assertRaises(MemoryError, alloc) + self.assertRaises(MemoryError, alloc) def test_format_subclass(self): class S(str):