summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@googlemail.com>2011-04-30 19:37:43 +0200
committerRalf Gommers <ralf.gommers@googlemail.com>2011-04-30 19:41:45 +0200
commit26405fdf1ac0011d43d8904d88fe0296a92e2b42 (patch)
treee8b9744cfc662b7ca5eadc083905c3f86df6be58
parent5aa360321321c69d8052ef0718721baae3587900 (diff)
downloadnumpy-26405fdf1ac0011d43d8904d88fe0296a92e2b42.tar.gz
TST: fix test due to recent change for large arrays (ValueError / MemoryError).
-rw-r--r--numpy/core/tests/test_multiarray.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index f0d50aa24..72b960d10 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -1151,7 +1151,7 @@ class TestIO(object):
def test_bool_fromstring(self):
v = np.array([True,False,True,False], dtype=np.bool_)
y = np.fromstring('1 0 -2.3 0.0', sep=' ', dtype=np.bool_)
- assert_array_equal(v, y)
+ assert_array_equal(v, y)
def test_empty_files_binary(self):
f = open(self.filename, 'w')
@@ -1255,7 +1255,7 @@ class TestIO(object):
# check only start and end for speed:
assert_((a[:n] == testbytes).all())
assert_((a[-n:] == testbytes).all())
- except MemoryError:
+ except (MemoryError, ValueError):
pass
def test_string(self):