mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 13:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use more specific assert* methods in test_struct.

Browse source
This commit is contained in:
Ezio Melotti 2010-04-04 07:00:02 +00:00
parent 4edfe96381
commit a28eb1c429
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/test/test_struct.py
View file

@ -170,17 +170,17 @@ class StructTest(unittest.TestCase):
self.assertEqual(signed_size, unsigned_size) self.assertEqual(signed_size, unsigned_size)
# bounds for native integer sizes # bounds for native integer sizes
self.assertTrue(struct.calcsize('b')==1) self.assertEqual(struct.calcsize('b'), 1)
self.assertTrue(2 <= struct.calcsize('h')) self.assertLessEqual(2, struct.calcsize('h'))
self.assertTrue(4 <= struct.calcsize('l')) self.assertLessEqual(4, struct.calcsize('l'))
self.assertTrue(struct.calcsize('h') <= struct.calcsize('i')) self.assertLessEqual(struct.calcsize('h'), struct.calcsize('i'))
self.assertTrue(struct.calcsize('i') <= struct.calcsize('l')) self.assertLessEqual(struct.calcsize('i'), struct.calcsize('l'))
# tests for native 'q' and 'Q' when applicable # tests for native 'q' and 'Q' when applicable
if HAVE_LONG_LONG: if HAVE_LONG_LONG:
self.assertEqual(struct.calcsize('q'), struct.calcsize('Q')) self.assertEqual(struct.calcsize('q'), struct.calcsize('Q'))
self.assertTrue(8 <= struct.calcsize('q')) self.assertLessEqual(8, struct.calcsize('q'))
self.assertTrue(struct.calcsize('l') <= struct.calcsize('q')) self.assertLessEqual(struct.calcsize('l'), struct.calcsize('q'))
def test_integers(self): def test_integers(self):
# Integer tests (bBhHiIlLqQ). # Integer tests (bBhHiIlLqQ).
@ -218,7 +218,7 @@ class StructTest(unittest.TestCase):
expected = long(x) expected = long(x)
if self.signed and x < 0: if self.signed and x < 0:
expected += 1L << self.bitsize expected += 1L << self.bitsize
self.assertTrue(expected >= 0) self.assertGreaterEqual(expected, 0)
expected = '%x' % expected expected = '%x' % expected
if len(expected) & 1: if len(expected) & 1:
expected = "0" + expected expected = "0" + expected