[Python-checkins] r55877 - python/branches/release25-maint/Lib/test/test_str.py python/branches/release25-maint/Lib/test/test_unicode.py

[neal.norwitz]

Author: neal.norwitz
Date: Mon Jun 11 06:31:25 2007
New Revision: 55877

Modified:
   python/branches/release25-maint/Lib/test/test_str.py
   python/branches/release25-maint/Lib/test/test_unicode.py
Log:
Backport 55873:
Prevent these tests from running on Win64 since they don't apply there either


Modified: python/branches/release25-maint/Lib/test/test_str.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_str.py	(original)
+++ python/branches/release25-maint/Lib/test/test_str.py	Mon Jun 11 06:31:25 2007
@@ -1,5 +1,6 @@
 
 import unittest
+import struct
 import sys
 from test import test_support, string_tests
 
@@ -88,7 +89,7 @@
         # This test only affects 32-bit platforms because expandtabs can only take
         # an int as the max value, not a 64-bit C long.  If expandtabs is changed
         # to take a 64-bit long, this test should apply to all platforms.
-        if sys.maxint > (1 << 32):
+        if sys.maxint > (1 << 32) or struct.calcsize('P') != 4:
             return
         self.assertRaises(OverflowError, 't\tt\t'.expandtabs, sys.maxint)
 

Modified: python/branches/release25-maint/Lib/test/test_unicode.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_unicode.py	(original)
+++ python/branches/release25-maint/Lib/test/test_unicode.py	Mon Jun 11 06:31:25 2007
@@ -6,7 +6,7 @@
 (c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
 
 """#"
-import unittest, sys, string, codecs, new
+import unittest, sys, struct, codecs, new
 from test import test_support, string_tests
 
 # Error handling (bad decoder return)
@@ -821,7 +821,7 @@
         # This test only affects 32-bit platforms because expandtabs can only take
         # an int as the max value, not a 64-bit C long.  If expandtabs is changed
         # to take a 64-bit long, this test should apply to all platforms.
-        if sys.maxint > (1 << 32):
+        if sys.maxint > (1 << 32) or struct.calcsize('P') != 4:
             return
         self.assertRaises(OverflowError, u't\tt\t'.expandtabs, sys.maxint)