[Python-checkins] r55102 - python/trunk/Lib/test/string_tests.py python/trunk/Lib/test/test_format.py python/trunk/Lib/test/test_index.py python/trunk/Lib/test/test_itertools.py python/trunk/Lib/test/test_unittest.py
kristjan.jonsson
python-checkins at python.org
Thu May 3 22:09:59 CEST 2007
Author: kristjan.jonsson
Date: Thu May 3 22:09:56 2007
New Revision: 55102
Modified:
python/trunk/Lib/test/string_tests.py
python/trunk/Lib/test/test_format.py
python/trunk/Lib/test/test_index.py
python/trunk/Lib/test/test_itertools.py
python/trunk/Lib/test/test_unittest.py
Log:
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
Modified: python/trunk/Lib/test/string_tests.py
==============================================================================
--- python/trunk/Lib/test/string_tests.py (original)
+++ python/trunk/Lib/test/string_tests.py Thu May 3 22:09:56 2007
@@ -2,7 +2,7 @@
Common tests shared by test_str, test_unicode, test_userstring and test_string.
"""
-import unittest, string, sys
+import unittest, string, sys, struct
from test import test_support
from UserList import UserList
@@ -671,7 +671,7 @@
def test_replace_overflow(self):
# Check for overflow checking on 32 bit machines
- if sys.maxint != 2147483647:
+ if sys.maxint != 2147483647 or struct.calcsize("P") > 4:
return
A2_16 = "A" * (2**16)
self.checkraises(OverflowError, A2_16, "replace", "", A2_16)
Modified: python/trunk/Lib/test/test_format.py
==============================================================================
--- python/trunk/Lib/test/test_format.py (original)
+++ python/trunk/Lib/test/test_format.py Thu May 3 22:09:56 2007
@@ -1,5 +1,7 @@
from test.test_support import verbose, have_unicode, TestFailed
import sys
+from test.test_support import MAX_Py_ssize_t
+maxsize = MAX_Py_ssize_t
# test string formatting operator (I am not sure if this is being tested
# elsewhere but, surely, some of the given cases are *not* tested because
@@ -238,11 +240,11 @@
test_exc('%o', Foobar(), TypeError,
"expected string or Unicode object, long found")
-if sys.maxint == 2**31-1:
+if maxsize == 2**31-1:
# crashes 2.2.1 and earlier:
try:
- "%*d"%(sys.maxint, -127)
+ "%*d"%(maxsize, -127)
except MemoryError:
pass
else:
- raise TestFailed, '"%*d"%(sys.maxint, -127) should fail'
+ raise TestFailed, '"%*d"%(maxsize, -127) should fail'
Modified: python/trunk/Lib/test/test_index.py
==============================================================================
--- python/trunk/Lib/test/test_index.py (original)
+++ python/trunk/Lib/test/test_index.py Thu May 3 22:09:56 2007
@@ -1,7 +1,10 @@
import unittest
from test import test_support
import operator
+import sys
from sys import maxint
+maxsize = test_support.MAX_Py_ssize_t
+minsize = -maxsize-1
class oldstyle:
def __index__(self):
@@ -185,7 +188,7 @@
def _getitem_helper(self, base):
class GetItem(base):
def __len__(self):
- return maxint
+ return maxint #cannot return long here
def __getitem__(self, key):
return key
def __getslice__(self, i, j):
@@ -193,8 +196,8 @@
x = GetItem()
self.assertEqual(x[self.pos], self.pos)
self.assertEqual(x[self.neg], self.neg)
- self.assertEqual(x[self.neg:self.pos], (-1, maxint))
- self.assertEqual(x[self.neg:self.pos:1].indices(maxint), (0, maxint, 1))
+ self.assertEqual(x[self.neg:self.pos], (maxint+minsize, maxsize))
+ self.assertEqual(x[self.neg:self.pos:1].indices(maxsize), (0, maxsize, 1))
def test_getitem(self):
self._getitem_helper(object)
Modified: python/trunk/Lib/test/test_itertools.py
==============================================================================
--- python/trunk/Lib/test/test_itertools.py (original)
+++ python/trunk/Lib/test/test_itertools.py Thu May 3 22:09:56 2007
@@ -5,6 +5,8 @@
import sys
import operator
import random
+maxsize = test_support.MAX_Py_ssize_t
+minsize = -maxsize-1
def onearg(x):
'Test function of one argument'
@@ -52,7 +54,7 @@
self.assertEqual(take(2, zip('abc',count(3))), [('a', 3), ('b', 4)])
self.assertRaises(TypeError, count, 2, 3)
self.assertRaises(TypeError, count, 'a')
- self.assertRaises(OverflowError, list, islice(count(sys.maxint-5), 10))
+ self.assertRaises(OverflowError, list, islice(count(maxsize-5), 10))
c = count(3)
self.assertEqual(repr(c), 'count(3)')
c.next()
@@ -330,7 +332,7 @@
self.assertRaises(ValueError, islice, xrange(10), 1, 'a')
self.assertRaises(ValueError, islice, xrange(10), 'a', 1, 1)
self.assertRaises(ValueError, islice, xrange(10), 1, 'a', 1)
- self.assertEqual(len(list(islice(count(), 1, 10, sys.maxint))), 1)
+ self.assertEqual(len(list(islice(count(), 1, 10, maxsize))), 1)
def test_takewhile(self):
data = [1, 3, 5, 20, 2, 4, 6, 8]
Modified: python/trunk/Lib/test/test_unittest.py
==============================================================================
--- python/trunk/Lib/test/test_unittest.py (original)
+++ python/trunk/Lib/test/test_unittest.py Thu May 3 22:09:56 2007
@@ -540,7 +540,8 @@
# audioop should now be loaded, thanks to loadTestsFromName()
self.failUnless(module_name in sys.modules)
finally:
- del sys.modules[module_name]
+ if module_name in sys.modules:
+ del sys.modules[module_name]
################################################################
### Tests for TestLoader.loadTestsFromName()
@@ -936,7 +937,8 @@
# audioop should now be loaded, thanks to loadTestsFromName()
self.failUnless(module_name in sys.modules)
finally:
- del sys.modules[module_name]
+ if module_name in sys.modules:
+ del sys.modules[module_name]
################################################################
### /Tests for TestLoader.loadTestsFromNames()
More information about the Python-checkins
mailing list