summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-11-06 13:09:10 -0700
committerGitHub <noreply@github.com>2017-11-06 13:09:10 -0700
commit6063ee87753bb8ca28bbda914eaf24108fd805c9 (patch)
treef8c1d6f53ce15a742226963b96de06a220e78826 /numpy
parentb97f9b0cd6b08e2174fbde6329d16099856e5947 (diff)
parent7ee292f7ebd97c6b9a589382c0f92a2579e30f01 (diff)
downloadnumpy-6063ee87753bb8ca28bbda914eaf24108fd805c9.tar.gz
Merge pull request #9973 from eric-wieser/fix-assertEqual
TST: Fix error in test on PyPy, add comment explaining known failure
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/tests/test_scalarmath.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py
index 1909f497f..1784c5694 100644
--- a/numpy/core/tests/test_scalarmath.py
+++ b/numpy/core/tests/test_scalarmath.py
@@ -408,7 +408,8 @@ class TestConversion(object):
assert_raises(OverflowError, int, x)
assert_equal(len(sup.log), 1)
- @dec.knownfailureif(not IS_PYPY)
+ @dec.knownfailureif(not IS_PYPY,
+ "__int__ is not the same as int in cpython (gh-9972)")
def test_clongdouble___int__(self):
x = np.longdouble(np.inf)
assert_raises(OverflowError, x.__int__)
@@ -416,7 +417,7 @@ class TestConversion(object):
sup.record(np.ComplexWarning)
x = np.clongdouble(np.inf)
assert_raises(OverflowError, x.__int__)
- self.assertEqual(len(sup.log), 1)
+ assert_equal(len(sup.log), 1)
def test_numpy_scalar_relational_operators(self):
# All integer