From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 12 Jan 2011 20:46:37 +0000 (+0000)
Subject: Fix the expected memory use of utf-8 encoding.  Also, release the
X-Git-Tag: v3.2rc1~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45545f79c94460dbfe18b22116f6294468dd09c9;p=thirdparty%2FPython%2Fcpython.git

Fix the expected memory use of utf-8 encoding.  Also, release the
one reference to a huge object even when an exception is raised.
---

diff --git a/Lib/test/test_bigmem.py b/Lib/test/test_bigmem.py
index e2b552101b2e..ac6b1096e163 100644
--- a/Lib/test/test_bigmem.py
+++ b/Lib/test/test_bigmem.py
@@ -564,8 +564,11 @@ class StrTest(unittest.TestCase, BaseStrTest):
         if expectedsize is None:
             expectedsize = size
 
-        s = c * size
-        self.assertEqual(len(s.encode(enc)), expectedsize)
+        try:
+            s = c * size
+            self.assertEqual(len(s.encode(enc)), expectedsize)
+        finally:
+            s = None
 
     def setUp(self):
         # HACK: adjust memory use of tests inherited from BaseStrTest
@@ -586,7 +589,8 @@ class StrTest(unittest.TestCase, BaseStrTest):
         for name, memuse in self._adjusted.items():
             getattr(type(self), name).memuse = memuse
 
-    @bigmemtest(minsize=_2G + 2, memuse=character_size + 1)
+    # the utf8 encoder preallocates big time (4x the number of characters)
+    @bigmemtest(minsize=_2G + 2, memuse=character_size + 4)
     def test_encode(self, size):
         return self.basic_encode_test(size, 'utf-8')