summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-03-19 13:37:08 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-03-19 13:37:08 (GMT)
commitfaa663f03dfeb11274f6edd787e2ec1f73623308 (patch)
tree1890e324edafe90c42cce8b782d37e288666c3af /Lib
parent431065247a3ef0051d30d90ba4910f14303b401c (diff)
downloadcpython-faa663f03dfeb11274f6edd787e2ec1f73623308.zip
cpython-faa663f03dfeb11274f6edd787e2ec1f73623308.tar.gz
cpython-faa663f03dfeb11274f6edd787e2ec1f73623308.tar.bz2
Fixed a failure in test_bigmem.
Merged revision 79059 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79059 | florent.xicluna | 2010-03-18 22:50:06 +0100 (jeu, 18 mar 2010) | 2 lines Issue #8024: Update the Unicode database to 5.2 ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_bigmem.py12
-rw-r--r--Lib/test/test_unicodedata.py4
2 files changed, 9 insertions, 7 deletions
diff --git a/Lib/test/test_bigmem.py b/Lib/test/test_bigmem.py
index 6b54e85..eda3e7c 100644
--- a/Lib/test/test_bigmem.py
+++ b/Lib/test/test_bigmem.py
@@ -618,7 +618,7 @@ class StrTest(unittest.TestCase, BaseStrTest):
@precisionbigmemtest(size=_4G // 5, memuse=character_size * (6 + 1))
def test_unicode_repr_overflow(self, size):
try:
- s = "\uAAAA"*size
+ s = "\uDCBA"*size
r = repr(s)
except MemoryError:
pass # acceptable on 32-bit
@@ -679,22 +679,24 @@ class StrTest(unittest.TestCase, BaseStrTest):
@bigmemtest(minsize=2**32 / 5, memuse=character_size * 7)
def test_unicode_repr(self, size):
- s = "\uAAAA" * size
+ # Use an assigned, but not printable code point.
+ # It is in the range of the low surrogates \uDC00-\uDFFF.
+ s = "\uDCBA" * size
for f in (repr, ascii):
r = f(s)
self.assertTrue(len(r) > size)
- self.assertTrue(r.endswith(r"\uaaaa'"), r[-10:])
+ self.assertTrue(r.endswith(r"\udcba'"), r[-10:])
del r
# The character takes 4 bytes even in UCS-2 builds because it will
# be decomposed into surrogates.
@bigmemtest(minsize=2**32 / 5, memuse=4 + character_size * 9)
def test_unicode_repr_wide(self, size):
- s = "\U0001AAAA" * size
+ s = "\U0001DCBA" * size
for f in (repr, ascii):
r = f(s)
self.assertTrue(len(r) > size)
- self.assertTrue(r.endswith(r"\U0001aaaa'"), r[-12:])
+ self.assertTrue(r.endswith(r"\U0001dcba'"), r[-12:])
del r
diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py
index 46f0607..9777f73 100644
--- a/Lib/test/test_unicodedata.py
+++ b/Lib/test/test_unicodedata.py
@@ -21,7 +21,7 @@ errors = 'surrogatepass'
class UnicodeMethodsTest(unittest.TestCase):
# update this, if the database changes
- expectedchecksum = '0b915116051f3ed029a98542c2b7df63c9646272'
+ expectedchecksum = '4504dffd035baea02c5b9de82bebc3d65e0e0baf'
def test_method_checksum(self):
h = hashlib.sha1()
@@ -80,7 +80,7 @@ class UnicodeDatabaseTest(unittest.TestCase):
class UnicodeFunctionsTest(UnicodeDatabaseTest):
# update this, if the database changes
- expectedchecksum = 'd4169ccff998ebbd1ec007a0b3fbd66e5ccf0229'
+ expectedchecksum = '6ccf1b1a36460d2694f9b0b0f0324942fe70ede6'
def test_function_checksum(self):
data = []