[Python-checkins] r82637 - python/branches/py3k/Lib/test/test_struct.py
benjamin.peterson
python-checkins at python.org
Thu Jul 8 00:45:06 CEST 2010
Author: benjamin.peterson
Date: Thu Jul 8 00:45:06 2010
New Revision: 82637
Log:
ValueError in this case is also acceptable
Modified:
python/branches/py3k/Lib/test/test_struct.py
Modified: python/branches/py3k/Lib/test/test_struct.py
==============================================================================
--- python/branches/py3k/Lib/test/test_struct.py (original)
+++ python/branches/py3k/Lib/test/test_struct.py Thu Jul 8 00:45:06 2010
@@ -438,8 +438,10 @@
# Go beyond boundaries.
small_buf = array.array('b', b' '*10)
- self.assertRaises(struct.error, s.pack_into, small_buf, 0, test_string)
- self.assertRaises(struct.error, s.pack_into, small_buf, 2, test_string)
+ self.assertRaises((ValueError, struct.error), s.pack_into, small_buf, 0,
+ test_string)
+ self.assertRaises((ValueError, struct.error), s.pack_into, small_buf, 2,
+ test_string)
# Test bogus offset (issue 3694)
sb = small_buf
@@ -463,8 +465,10 @@
# Go beyond boundaries.
small_buf = array.array('b', b' '*10)
- self.assertRaises(struct.error, pack_into, small_buf, 0, test_string)
- self.assertRaises(struct.error, pack_into, small_buf, 2, test_string)
+ self.assertRaises((ValueError, struct.error), pack_into, small_buf, 0,
+ test_string)
+ self.assertRaises((ValueError, struct.error), pack_into, small_buf, 2,
+ test_string)
def test_unpack_with_buffer(self):
# SF bug 1563759: struct.unpack doens't support buffer protocol objects
More information about the Python-checkins
mailing list