From 11c5275c6129c2600a29111c9529d1e51aaf3cb6 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Mon, 11 Jun 2007 04:31:25 +0000 Subject: [PATCH] Backport 55873: Prevent these tests from running on Win64 since they don't apply there either --- Lib/test/test_str.py | 3 ++- Lib/test/test_unicode.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py index 18535173457..3acb6d10db2 100644 --- 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 1e4c7d98c38..4f757714582 100644 --- 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)