From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 17 Aug 2008 17:06:51 +0000 (+0000)
Subject: Merged revisions 65773 via svnmerge from
X-Git-Tag: v3.0b3~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3db3e874347824f78f02c4021aa8e94a69564b11;p=python

Merged revisions 65773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65773 | antoine.pitrou | 2008-08-17 19:01:49 +0200 (dim., 17 août 2008) | 3 lines

  #3556: test_raiseMemError consumes an insane amount of memory
........
---

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index fdd90ca166..f82a64280e 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1155,20 +1155,15 @@ class UnicodeTest(
             return
         self.assertRaises(OverflowError, 't\tt\t'.expandtabs, sys.maxsize)
 
-
     def test_raiseMemError(self):
         # Ensure that the freelist contains a consistent object, even
         # when a string allocation fails with a MemoryError.
         # This used to crash the interpreter,
         # or leak references when the number was smaller.
-        try:
-            "a" * (sys.maxsize // 2 - 100)
-        except MemoryError:
-            pass
-        try:
-            "a" * (sys.maxsize // 2 - 100)
-        except MemoryError:
-            pass
+        alloc = lambda: "a" * (sys.maxsize - 100)
+        self.assertRaises(MemoryError, alloc)
+        self.assertRaises(MemoryError, alloc)
+
 
 def test_main():
     support.run_unittest(__name__)