Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 79740 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79740 | ezio.melotti | 2010-04-04 10:00:02 +0300 (Sun, 04 Apr 2010) | 1 line

  Use more specific assert* methods in test_struct.
........
This commit is contained in:
Ezio Melotti 2010-04-04 07:21:15 +00:00
parent 6f40184757
commit 4c28ddc2f2
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

@ -164,14 +164,14 @@ def test_calcsize(self):
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'))
if HAVE_LONG_LONG: if HAVE_LONG_LONG:
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).
@ -209,7 +209,7 @@ def test_one(self, x, pack=struct.pack,
expected = x expected = x
if self.signed and x < 0: if self.signed and x < 0:
expected += 1 << self.bitsize expected += 1 << 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