summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-12-05 01:35:55 -0500
committerGitHub <noreply@github.com>2016-12-05 01:35:55 -0500
commitc1e9bfe7bb66d6ee9d28ae1014c126b15cfcd32b (patch)
tree0f25b743babb6f635b480b6c66e561d7a396ddf8
parent667dff7dfeaa9c35da0d92945747b07cbd4671c0 (diff)
parent315010149a085cba4b0395df0184e67c2e976a9d (diff)
downloadnumpy-c1e9bfe7bb66d6ee9d28ae1014c126b15cfcd32b.tar.gz
Merge pull request #8346 from charris/fix-backport-8335
TST: Fix tests in PR #8341 for NumPy 1.11.x
-rw-r--r--numpy/core/tests/test_multiarray.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index 7e3d1b7d0..b896e2161 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -3991,10 +3991,7 @@ class TestResize(TestCase):
def test_int_shape(self):
x = np.eye(3)
- if IS_PYPY:
- x.resize(3, refcheck=False)
- else:
- x.resize(3)
+ x.resize(3)
assert_array_equal(x, np.eye(3)[0,:])
def test_none_shape(self):
@@ -4017,10 +4014,7 @@ class TestResize(TestCase):
def test_zeros_appended(self):
x = np.eye(3)
- if IS_PYPY:
- x.resize(2, 3, 3, refcheck=False)
- else:
- x.resize(2, 3, 3)
+ x.resize(2, 3, 3)
assert_array_equal(x[0], np.eye(3))
assert_array_equal(x[1], np.zeros((3, 3)))