BUG: Move the default errstate test over to the right place. Fix the seterr test case to take the new defaults into account.

2 files changed, 12 insertions, 12 deletions

diff --git a/numpy/core/tests/test_errstate.py b/numpy/core/tests/test_errstate.py
index 48838f4f7..732bb3e93 100644
--- a/numpy/core/tests/test_errstate.py
+++ b/numpy/core/tests/test_errstate.py
@@ -13,15 +13,6 @@ from numpy.random import rand, randint
 from numpy.testing import *
 
 class TestErrstate(TestCase):
-    def test_default(self):
-        err = geterr()
-        self.assertEqual(err, dict(
-            divide='warn',
-            invalid='warn',
-            over='warn',
-            under='ignore',
-        ))
-
     def test_invalid(self):
         with errstate(all='raise', under='ignore'):
             a = -arange(3)
diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py
index f7ecdfbcf..eacb2aebf 100644
--- a/numpy/core/tests/test_numeric.py
+++ b/numpy/core/tests/test_numeric.py
@@ -222,16 +222,25 @@ class TestBoolScalar(TestCase):
 
 
 class TestSeterr(TestCase):
+    def test_default(self):
+        err = geterr()
+        self.assertEqual(err, dict(
+            divide='warn',
+            invalid='warn',
+            over='warn',
+            under='ignore',
+        ))
+
     def test_set(self):
         err = seterr()
         try:
-            old = seterr(divide='warn')
+            old = seterr(divide='print')
             self.assertTrue(err == old)
             new = seterr()
-            self.assertTrue(new['divide'] == 'warn')
+            self.assertTrue(new['divide'] == 'print')
             seterr(over='raise')
             self.assertTrue(geterr()['over'] == 'raise')
-            self.assertTrue(new['divide'] == 'warn')
+            self.assertTrue(new['divide'] == 'print')
             seterr(**old)
             self.assertTrue(geterr() == old)
         finally: