Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Unfortunately, the std-mode bBhHIL codes don't do any range-checking; if and when some of those get fixed, remove their letters from the IntTester.BUGGY_RANGE_CHECK string. In the meantime, a msg saying that range-tests are getting skipped is printed to stdout whenever one is skipped.
This commit is contained in:
parent
f251d06a66
commit
17e17d4406
|
@ -2,6 +2,23 @@ from test_support import TestFailed, verbose, verify
|
||||||
import struct
|
import struct
|
||||||
## import pdb
|
## import pdb
|
||||||
|
|
||||||
|
import sys
|
||||||
|
ISBIGENDIAN = sys.byteorder == "big"
|
||||||
|
del sys
|
||||||
|
verify((struct.pack('=i', 1)[0] == chr(0)) == ISBIGENDIAN,
|
||||||
|
"bigendian determination appears wrong")
|
||||||
|
|
||||||
|
def string_reverse(s):
|
||||||
|
chars = list(s)
|
||||||
|
chars.reverse()
|
||||||
|
return "".join(chars)
|
||||||
|
|
||||||
|
def bigendian_to_native(value):
|
||||||
|
if ISBIGENDIAN:
|
||||||
|
return value
|
||||||
|
else:
|
||||||
|
return string_reverse(value)
|
||||||
|
|
||||||
def simple_err(func, *args):
|
def simple_err(func, *args):
|
||||||
try:
|
try:
|
||||||
apply(func, args)
|
apply(func, args)
|
||||||
|
@ -22,6 +39,7 @@ def any_err(func, *args):
|
||||||
func.__name__, args)
|
func.__name__, args)
|
||||||
## pdb.set_trace()
|
## pdb.set_trace()
|
||||||
|
|
||||||
|
|
||||||
simple_err(struct.calcsize, 'Z')
|
simple_err(struct.calcsize, 'Z')
|
||||||
|
|
||||||
sz = struct.calcsize('i')
|
sz = struct.calcsize('i')
|
||||||
|
@ -103,13 +121,11 @@ tests = [
|
||||||
'\000\000\000\000\000\000\000\300', 0),
|
'\000\000\000\000\000\000\000\300', 0),
|
||||||
]
|
]
|
||||||
|
|
||||||
isbigendian = struct.pack('=i', 1)[0] == chr(0)
|
|
||||||
|
|
||||||
for fmt, arg, big, lil, asy in tests:
|
for fmt, arg, big, lil, asy in tests:
|
||||||
if verbose:
|
if verbose:
|
||||||
print `fmt`, `arg`, `big`, `lil`
|
print `fmt`, `arg`, `big`, `lil`
|
||||||
for (xfmt, exp) in [('>'+fmt, big), ('!'+fmt, big), ('<'+fmt, lil),
|
for (xfmt, exp) in [('>'+fmt, big), ('!'+fmt, big), ('<'+fmt, lil),
|
||||||
('='+fmt, isbigendian and big or lil)]:
|
('='+fmt, ISBIGENDIAN and big or lil)]:
|
||||||
res = struct.pack(xfmt, arg)
|
res = struct.pack(xfmt, arg)
|
||||||
if res != exp:
|
if res != exp:
|
||||||
raise TestFailed, "pack(%s, %s) -> %s # expected %s" % (
|
raise TestFailed, "pack(%s, %s) -> %s # expected %s" % (
|
||||||
|
@ -124,7 +140,7 @@ for fmt, arg, big, lil, asy in tests:
|
||||||
`fmt`, `res`, `rev`, `arg`)
|
`fmt`, `res`, `rev`, `arg`)
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# q/Q tests.
|
# Simple native q/Q tests.
|
||||||
|
|
||||||
has_native_qQ = 1
|
has_native_qQ = 1
|
||||||
try:
|
try:
|
||||||
|
@ -139,17 +155,6 @@ any_err(struct.pack, "Q", -1) # can't pack -1 as unsigned regardless
|
||||||
simple_err(struct.pack, "q", "a") # can't pack string as 'q' regardless
|
simple_err(struct.pack, "q", "a") # can't pack string as 'q' regardless
|
||||||
simple_err(struct.pack, "Q", "a") # ditto, but 'Q'
|
simple_err(struct.pack, "Q", "a") # ditto, but 'Q'
|
||||||
|
|
||||||
def string_reverse(s):
|
|
||||||
chars = list(s)
|
|
||||||
chars.reverse()
|
|
||||||
return "".join(chars)
|
|
||||||
|
|
||||||
def bigendian_to_native(value):
|
|
||||||
if isbigendian:
|
|
||||||
return value
|
|
||||||
else:
|
|
||||||
return string_reverse(value)
|
|
||||||
|
|
||||||
def test_native_qQ():
|
def test_native_qQ():
|
||||||
bytes = struct.calcsize('q')
|
bytes = struct.calcsize('q')
|
||||||
# The expected values here are in big-endian format, primarily because
|
# The expected values here are in big-endian format, primarily because
|
||||||
|
@ -175,149 +180,188 @@ def test_native_qQ():
|
||||||
if has_native_qQ:
|
if has_native_qQ:
|
||||||
test_native_qQ()
|
test_native_qQ()
|
||||||
|
|
||||||
# Standard q/Q (8 bytes; should work on all platforms).
|
###########################################################################
|
||||||
|
# Standard integer tests (bBhHiIlLqQ).
|
||||||
MIN_Q, MAX_Q = 0, 2L**64 - 1
|
|
||||||
MIN_q, MAX_q = -(2L**63), 2L**63 - 1
|
|
||||||
|
|
||||||
import binascii
|
import binascii
|
||||||
def test_one_qQ(x, pack=struct.pack,
|
|
||||||
unpack=struct.unpack,
|
|
||||||
unhexlify=binascii.unhexlify):
|
|
||||||
if verbose:
|
|
||||||
print "trying std q/Q on", x, "==", hex(x)
|
|
||||||
|
|
||||||
# Try 'q'.
|
class IntTester:
|
||||||
if MIN_q <= x <= MAX_q:
|
|
||||||
# Try '>q'.
|
|
||||||
expected = long(x)
|
|
||||||
if x < 0:
|
|
||||||
expected += 1L << 64
|
|
||||||
assert expected > 0
|
|
||||||
expected = hex(expected)[2:-1] # chop "0x" and trailing 'L'
|
|
||||||
if len(expected) & 1:
|
|
||||||
expected = "0" + expected
|
|
||||||
expected = unhexlify(expected)
|
|
||||||
expected = "\x00" * (8 - len(expected)) + expected
|
|
||||||
|
|
||||||
# >q pack work?
|
# XXX Most std integer modes fail to test for out-of-range.
|
||||||
got = pack(">q", x)
|
BUGGY_RANGE_CHECK = "bBhHIL"
|
||||||
verify(got == expected,
|
|
||||||
"'>q'-pack of %r gave %r, not %r" %
|
|
||||||
(x, got, expected))
|
|
||||||
|
|
||||||
# >q unpack work?
|
def __init__(self, formatpair, bytesize):
|
||||||
retrieved = unpack(">q", got)[0]
|
assert len(formatpair) == 2
|
||||||
verify(x == retrieved,
|
self.formatpair = formatpair
|
||||||
"'>q'-unpack of %r gave %r, not %r" %
|
for direction in "<>!=":
|
||||||
(got, retrieved, x))
|
for code in formatpair:
|
||||||
|
format = direction + code
|
||||||
|
verify(struct.calcsize(format) == bytesize)
|
||||||
|
self.bytesize = bytesize
|
||||||
|
self.bitsize = bytesize * 8
|
||||||
|
self.signed_code, self.unsigned_code = formatpair
|
||||||
|
self.unsigned_min = 0
|
||||||
|
self.unsigned_max = 2L**self.bitsize - 1
|
||||||
|
self.signed_min = -(2L**(self.bitsize-1))
|
||||||
|
self.signed_max = 2L**(self.bitsize-1) - 1
|
||||||
|
|
||||||
# Adding any byte should cause a "too big" error.
|
def test_one(self, x, pack=struct.pack,
|
||||||
any_err(unpack, ">q", '\x01' + got)
|
unpack=struct.unpack,
|
||||||
|
unhexlify=binascii.unhexlify):
|
||||||
|
if verbose:
|
||||||
|
print "trying std", self.formatpair, "on", x, "==", hex(x)
|
||||||
|
|
||||||
# Try '<q'.
|
# Try signed.
|
||||||
expected = string_reverse(expected)
|
code = self.signed_code
|
||||||
|
if self.signed_min <= x <= self.signed_max:
|
||||||
|
# Try big-endian.
|
||||||
|
expected = long(x)
|
||||||
|
if x < 0:
|
||||||
|
expected += 1L << self.bitsize
|
||||||
|
assert expected > 0
|
||||||
|
expected = hex(expected)[2:-1] # chop "0x" and trailing 'L'
|
||||||
|
if len(expected) & 1:
|
||||||
|
expected = "0" + expected
|
||||||
|
expected = unhexlify(expected)
|
||||||
|
expected = "\x00" * (self.bytesize - len(expected)) + expected
|
||||||
|
|
||||||
# <q pack work?
|
# Pack work?
|
||||||
got = pack("<q", x)
|
format = ">" + code
|
||||||
verify(got == expected,
|
got = pack(format, x)
|
||||||
"'<q'-pack of %r gave %r, not %r" %
|
verify(got == expected,
|
||||||
(x, got, expected))
|
"'%s'-pack of %r gave %r, not %r" %
|
||||||
|
(format, x, got, expected))
|
||||||
|
|
||||||
# <q unpack work?
|
# Unpack work?
|
||||||
retrieved = unpack("<q", got)[0]
|
retrieved = unpack(format, got)[0]
|
||||||
verify(x == retrieved,
|
verify(x == retrieved,
|
||||||
"'<q'-unpack of %r gave %r, not %r" %
|
"'%s'-unpack of %r gave %r, not %r" %
|
||||||
(got, retrieved, x))
|
(format, got, retrieved, x))
|
||||||
|
|
||||||
# Adding any byte should cause a "too big" error.
|
# Adding any byte should cause a "too big" error.
|
||||||
any_err(unpack, "<q", '\x01' + got)
|
any_err(unpack, format, '\x01' + got)
|
||||||
|
|
||||||
else:
|
# Try little-endian.
|
||||||
# x is out of q's range -- verify pack realizes that.
|
format = "<" + code
|
||||||
any_err(pack, '>q', x)
|
expected = string_reverse(expected)
|
||||||
any_err(pack, '<q', x)
|
|
||||||
|
|
||||||
# Much the same for 'Q'.
|
# Pack work?
|
||||||
if MIN_Q <= x <= MAX_Q:
|
got = pack(format, x)
|
||||||
# Try '>Q'.
|
verify(got == expected,
|
||||||
expected = long(x)
|
"'%s'-pack of %r gave %r, not %r" %
|
||||||
expected = hex(expected)[2:-1] # chop "0x" and trailing 'L'
|
(format, x, got, expected))
|
||||||
if len(expected) & 1:
|
|
||||||
expected = "0" + expected
|
|
||||||
expected = unhexlify(expected)
|
|
||||||
expected = "\x00" * (8 - len(expected)) + expected
|
|
||||||
|
|
||||||
# >Q pack work?
|
# Unpack work?
|
||||||
got = pack(">Q", x)
|
retrieved = unpack(format, got)[0]
|
||||||
verify(got == expected,
|
verify(x == retrieved,
|
||||||
"'>Q'-pack of %r gave %r, not %r" %
|
"'%s'-unpack of %r gave %r, not %r" %
|
||||||
(x, got, expected))
|
(format, got, retrieved, x))
|
||||||
|
|
||||||
# >Q unpack work?
|
# Adding any byte should cause a "too big" error.
|
||||||
retrieved = unpack(">Q", got)[0]
|
any_err(unpack, format, '\x01' + got)
|
||||||
verify(x == retrieved,
|
|
||||||
"'>Q'-unpack of %r gave %r, not %r" %
|
|
||||||
(got, retrieved, x))
|
|
||||||
|
|
||||||
# Adding any byte should cause a "too big" error.
|
else:
|
||||||
any_err(unpack, ">Q", '\x01' + got)
|
# x is out of range -- verify pack realizes that.
|
||||||
|
if code in self.BUGGY_RANGE_CHECK:
|
||||||
|
if verbose:
|
||||||
|
print "Skipping buggy range check for code", code
|
||||||
|
else:
|
||||||
|
any_err(pack, ">" + code, x)
|
||||||
|
any_err(pack, "<" + code, x)
|
||||||
|
|
||||||
# Try '<Q'.
|
# Much the same for unsigned.
|
||||||
expected = string_reverse(expected)
|
code = self.unsigned_code
|
||||||
|
if self.unsigned_min <= x <= self.unsigned_max:
|
||||||
|
# Try big-endian.
|
||||||
|
format = ">" + code
|
||||||
|
expected = long(x)
|
||||||
|
expected = hex(expected)[2:-1] # chop "0x" and trailing 'L'
|
||||||
|
if len(expected) & 1:
|
||||||
|
expected = "0" + expected
|
||||||
|
expected = unhexlify(expected)
|
||||||
|
expected = "\x00" * (self.bytesize - len(expected)) + expected
|
||||||
|
|
||||||
# <Q pack work?
|
# Pack work?
|
||||||
got = pack("<Q", x)
|
got = pack(format, x)
|
||||||
verify(got == expected,
|
verify(got == expected,
|
||||||
"'<Q'-pack of %r gave %r, not %r" %
|
"'%s'-pack of %r gave %r, not %r" %
|
||||||
(x, got, expected))
|
(format, x, got, expected))
|
||||||
|
|
||||||
# <Q unpack work?
|
# Unpack work?
|
||||||
retrieved = unpack("<Q", got)[0]
|
retrieved = unpack(format, got)[0]
|
||||||
verify(x == retrieved,
|
verify(x == retrieved,
|
||||||
"'<Q'-unpack of %r gave %r, not %r" %
|
"'%s'-unpack of %r gave %r, not %r" %
|
||||||
(got, retrieved, x))
|
(format, got, retrieved, x))
|
||||||
|
|
||||||
# Adding any byte should cause a "too big" error.
|
# Adding any byte should cause a "too big" error.
|
||||||
any_err(unpack, "<Q", '\x01' + got)
|
any_err(unpack, format, '\x01' + got)
|
||||||
|
|
||||||
else:
|
# Try little-endian.
|
||||||
# x is out of Q's range -- verify pack realizes that.
|
format = "<" + code
|
||||||
any_err(pack, '>Q', x)
|
expected = string_reverse(expected)
|
||||||
any_err(pack, '<Q', x)
|
|
||||||
|
|
||||||
def test_std_qQ():
|
# Pack work?
|
||||||
from random import randrange
|
got = pack(format, x)
|
||||||
|
verify(got == expected,
|
||||||
|
"'%s'-pack of %r gave %r, not %r" %
|
||||||
|
(format, x, got, expected))
|
||||||
|
|
||||||
# Create all interesting powers of 2.
|
# Unpack work?
|
||||||
values = []
|
retrieved = unpack(format, got)[0]
|
||||||
for exp in range(70):
|
verify(x == retrieved,
|
||||||
values.append(1L << exp)
|
"'%s'-unpack of %r gave %r, not %r" %
|
||||||
|
(format, got, retrieved, x))
|
||||||
|
|
||||||
# Add some random 64-bit values.
|
# Adding any byte should cause a "too big" error.
|
||||||
for i in range(50):
|
any_err(unpack, format, '\x01' + got)
|
||||||
val = 0L
|
|
||||||
for j in range(8):
|
|
||||||
val = (val << 8) | randrange(256)
|
|
||||||
values.append(val)
|
|
||||||
|
|
||||||
# Try all those, and their negations, and +-1 from them. Note
|
else:
|
||||||
# that this tests all power-of-2 boundaries in range, and a few out
|
# x is out of range -- verify pack realizes that.
|
||||||
# of range, plus +-(2**n +- 1).
|
if code in self.BUGGY_RANGE_CHECK:
|
||||||
for base in values:
|
if verbose:
|
||||||
for val in -base, base:
|
print "Skipping buggy range check for code", code
|
||||||
for incr in -1, 0, 1:
|
else:
|
||||||
x = val + incr
|
any_err(pack, ">" + code, x)
|
||||||
try:
|
any_err(pack, "<" + code, x)
|
||||||
x = int(x)
|
|
||||||
except OverflowError:
|
|
||||||
pass
|
|
||||||
test_one_qQ(x)
|
|
||||||
|
|
||||||
# Some error cases.
|
def run(self):
|
||||||
for direction in "<>":
|
from random import randrange
|
||||||
for letter in "qQ":
|
|
||||||
for badobject in "a string", 3+42j, randrange:
|
# Create all interesting powers of 2.
|
||||||
any_err(struct.pack, direction + letter, badobject)
|
values = []
|
||||||
|
for exp in range(self.bitsize + 3):
|
||||||
test_std_qQ()
|
values.append(1L << exp)
|
||||||
|
|
||||||
|
# Add some random values.
|
||||||
|
for i in range(self.bitsize):
|
||||||
|
val = 0L
|
||||||
|
for j in range(self.bytesize):
|
||||||
|
val = (val << 8) | randrange(256)
|
||||||
|
values.append(val)
|
||||||
|
|
||||||
|
# Try all those, and their negations, and +-1 from them. Note
|
||||||
|
# that this tests all power-of-2 boundaries in range, and a few out
|
||||||
|
# of range, plus +-(2**n +- 1).
|
||||||
|
for base in values:
|
||||||
|
for val in -base, base:
|
||||||
|
for incr in -1, 0, 1:
|
||||||
|
x = val + incr
|
||||||
|
try:
|
||||||
|
x = int(x)
|
||||||
|
except OverflowError:
|
||||||
|
pass
|
||||||
|
self.test_one(x)
|
||||||
|
|
||||||
|
# Some error cases.
|
||||||
|
for direction in "<>":
|
||||||
|
for code in self.formatpair:
|
||||||
|
for badobject in "a string", 3+42j, randrange:
|
||||||
|
any_err(struct.pack, direction + code, badobject)
|
||||||
|
|
||||||
|
for args in [("bB", 1),
|
||||||
|
("hH", 2),
|
||||||
|
("iI", 4),
|
||||||
|
("lL", 4),
|
||||||
|
("qQ", 8)]:
|
||||||
|
t = IntTester(*args)
|
||||||
|
t.run()
|
||||||
|
|
Loading…
Reference in New Issue