Merge pull request #8184 from person142/assert-allclose

charris · web-flow · commit 9cb5ac66edf2 · 2016-10-20T14:14:24.000-04:00
MAINT: make `assert_allclose` behavior on `nan`s match pre 1.12
diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py
@@ -7,8 +7,9 @@
 import numpy as np
 from numpy.testing import (
     assert_equal, assert_array_equal, assert_almost_equal,
-    assert_array_almost_equal, build_err_msg, raises, assert_raises,
-    assert_warns, assert_no_warnings, assert_allclose, assert_approx_equal,
+    assert_array_almost_equal, assert_array_less, build_err_msg,
+    raises, assert_raises, assert_warns, assert_no_warnings,
+    assert_allclose, assert_approx_equal,
     assert_array_almost_equal_nulp, assert_array_max_ulp,
     clear_and_catch_warnings, suppress_warnings, run_module_suite,
     assert_string_equal, assert_, tempdir, temppath,
@@ -566,6 +567,17 @@ def test_not_equal_nan(self):
         self.assertRaises(AssertionError, assert_allclose, a, b,
                           equal_nan=False)
 
+    def test_equal_nan_default(self):
+        # Make sure equal_nan default behavior remains unchanged. (All
+        # of these functions use assert_array_compare under the hood.)
+        # None of these should raise.
+        a = np.array([np.nan])
+        b = np.array([np.nan])
+        assert_array_equal(a, b)
+        assert_array_almost_equal(a, b)
+        assert_array_less(a, b)
+        assert_allclose(a, b)
+
 
 class TestArrayAlmostEqualNulp(unittest.TestCase):
 
diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py
@@ -1330,7 +1330,7 @@ def _assert_valid_refcount(op):
     del d  # for pyflakes
 
 
-def assert_allclose(actual, desired, rtol=1e-7, atol=0, equal_nan=False,
+def assert_allclose(actual, desired, rtol=1e-7, atol=0, equal_nan=True,
                     err_msg='', verbose=True):
     """
     Raises an AssertionError if two objects are not equal up to desired
