summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@googlemail.com>2011-04-03 13:19:46 +0200
committerRalf Gommers <ralf.gommers@googlemail.com>2011-04-03 13:19:46 +0200
commitf944e32ff172250045f3ca6f819bd96fbd3c6ebc (patch)
treec692f5f68a63b52cc21eedab03e303c96b486136
parenta311969ea2f47b486da14da99a26e72c12a0c20f (diff)
downloadnumpy-f944e32ff172250045f3ca6f819bd96fbd3c6ebc.tar.gz
TST: silence some harmless test warnings introduced by 65b77ee9.
-rw-r--r--numpy/core/tests/test_scalarmath.py2
-rw-r--r--numpy/core/tests/test_umath.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py
index a35a9c542..76220d82d 100644
--- a/numpy/core/tests/test_scalarmath.py
+++ b/numpy/core/tests/test_scalarmath.py
@@ -62,7 +62,7 @@ class TestPower(TestCase):
class TestComplexDivision(TestCase):
def test_zero_division(self):
- err = np.seterr(over="ignore")
+ err = np.seterr(all="ignore")
try:
for t in [np.complex64, np.complex128]:
a = t(0.0)
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
index 5f5d1257e..32dda95cf 100644
--- a/numpy/core/tests/test_umath.py
+++ b/numpy/core/tests/test_umath.py
@@ -29,7 +29,7 @@ class TestDivision(TestCase):
assert_almost_equal(y/x, [1, 1], err_msg=msg)
def test_zero_division_complex(self):
- err = np.seterr(invalid="ignore")
+ err = np.seterr(invalid="ignore", divide="ignore")
try:
x = np.array([0.0], dtype=np.complex128)
y = 1.0/x