From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 7 Jul 2010 23:26:57 +0000 (+0000)
Subject: Merged revisions 82637 via svnmerge from
X-Git-Tag: v2.7.1rc1~634
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86ac22e33833329906f1a68b5b771a8989ce6823;p=python

Merged revisions 82637 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82637 | benjamin.peterson | 2010-07-07 17:45:06 -0500 (Wed, 07 Jul 2010) | 1 line

  ValueError in this case is also acceptable
........
---

diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 1877192be8..f376ac3a9d 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -450,8 +450,10 @@ class StructTest(unittest.TestCase):
 
         # Go beyond boundaries.
         small_buf = array.array('c', ' '*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
@@ -475,8 +477,10 @@ class StructTest(unittest.TestCase):
 
         # Go beyond boundaries.
         small_buf = array.array('c', ' '*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):
         with check_py3k_warnings(("buffer.. not supported in 3.x",