diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-04-04 07:00:02 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-04-04 07:00:02 (GMT) |
| commit | a28eb1c429d07045c54d87615e509a508b99516e (patch) | |
| tree | 0e9070316d3163fa594653e20ae1109ca3957428 /Lib/test/test_struct.py | |
| parent | 4edfe963818e77b804c00ea423503cd7cd445943 (diff) | |
| download | cpython-a28eb1c429d07045c54d87615e509a508b99516e.zip cpython-a28eb1c429d07045c54d87615e509a508b99516e.tar.gz cpython-a28eb1c429d07045c54d87615e509a508b99516e.tar.bz2 | |
Use more specific assert* methods in test_struct.
Diffstat (limited to 'Lib/test/test_struct.py')
| -rw-r--r-- | Lib/test/test_struct.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 4329e95..3e7b259 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -170,17 +170,17 @@ class StructTest(unittest.TestCase): self.assertEqual(signed_size, unsigned_size) # bounds for native integer sizes - self.assertTrue(struct.calcsize('b')==1) - self.assertTrue(2 <= struct.calcsize('h')) - self.assertTrue(4 <= struct.calcsize('l')) - self.assertTrue(struct.calcsize('h') <= struct.calcsize('i')) - self.assertTrue(struct.calcsize('i') <= struct.calcsize('l')) + self.assertEqual(struct.calcsize('b'), 1) + self.assertLessEqual(2, struct.calcsize('h')) + self.assertLessEqual(4, struct.calcsize('l')) + self.assertLessEqual(struct.calcsize('h'), struct.calcsize('i')) + self.assertLessEqual(struct.calcsize('i'), struct.calcsize('l')) # tests for native 'q' and 'Q' when applicable if HAVE_LONG_LONG: self.assertEqual(struct.calcsize('q'), struct.calcsize('Q')) - self.assertTrue(8 <= struct.calcsize('q')) - self.assertTrue(struct.calcsize('l') <= struct.calcsize('q')) + self.assertLessEqual(8, struct.calcsize('q')) + self.assertLessEqual(struct.calcsize('l'), struct.calcsize('q')) def test_integers(self): # Integer tests (bBhHiIlLqQ). @@ -218,7 +218,7 @@ class StructTest(unittest.TestCase): expected = long(x) if self.signed and x < 0: expected += 1L << self.bitsize - self.assertTrue(expected >= 0) + self.assertGreaterEqual(expected, 0) expected = '%x' % expected if len(expected) & 1: expected = "0" + expected |