Backport 55873:

Prevent these tests from running on Win64 since they don't apply there either

diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py
index 18535173457d796ae1690e23c008ae0b897083bf..3acb6d10db2cb332c2d555a1c64d5e15359f0278 100644 (file)
--- a/Lib/test/test_str.py
+++ b/Lib/test/test_str.py
@@ -1,5 +1,6 @@
 
 import unittest
+import struct
 import sys
 from test import test_support, string_tests
 
@@ -88,7 +89,7 @@ class StrTest(
         # 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)
 

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 1e4c7d98c38fa103c0767a597f77727c5a7da08b..4f757714582b9cf71e4f5c6870ef5ea42b175fb1 100644 (file)
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -6,7 +6,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com).
 (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 @@ class UnicodeTest(
         # 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)