diff options
| author | Julian Taylor <jtaylor.debian@googlemail.com> | 2013-06-05 22:07:11 +0200 |
|---|---|---|
| committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2013-06-05 22:14:48 +0200 |
| commit | 37723a58124e0013c6f80b28a452b8ce7eb921fa (patch) | |
| tree | 7e30a00a8bc37b387a394de0912f32afd7b7762b | |
| parent | 41f6a89fe6a0201c3575446ed4140b52f51f64b2 (diff) | |
| download | numpy-37723a58124e0013c6f80b28a452b8ce7eb921fa.tar.gz | |
TST: fix some function name conflicts
enables a few extra tests
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_umath.py | 2 | ||||
| -rw-r--r-- | numpy/ma/tests/test_old_ma.py | 2 | ||||
| -rw-r--r-- | numpy/ma/tests/test_subclassing.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index 2f6716c23..87903c28a 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -1207,7 +1207,7 @@ class TestFancyIndexing(TestCase): x[m] = 5 assert_array_equal(x, array([1,5,3,4])) - def test_assign_mask(self): + def test_assign_mask2(self): xorig = array([[1,2,3,4],[5,6,7,8]]) m = array([0,1],bool) m2 = array([[0,1],[1,0]],bool) diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py index 1967db547..586b64636 100644 --- a/numpy/core/tests/test_umath.py +++ b/numpy/core/tests/test_umath.py @@ -348,7 +348,7 @@ class TestHypotSpecialValues(TestCase): assert_hypot_isnan(np.nan, np.nan) assert_hypot_isnan(np.nan, 1) - def test_nan_outputs(self): + def test_nan_outputs2(self): assert_hypot_isinf(np.nan, np.inf) assert_hypot_isinf(np.inf, np.nan) assert_hypot_isinf(np.inf, 0) diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py index 208086f7b..baa6f69a1 100644 --- a/numpy/ma/tests/test_old_ma.py +++ b/numpy/ma/tests/test_old_ma.py @@ -423,7 +423,7 @@ class TestMa(TestCase): z = where(c, 1, masked) assert_(eq(z, [99, 1, 1, 99, 99, 99])) - def test_testMinMax(self): + def test_testMinMax2(self): "Test of minumum, maximum." assert_(eq(minimum([1, 2, 3], [4, 0, 9]), [1, 0, 3])) assert_(eq(maximum([1, 2, 3], [4, 0, 9]), [4, 2, 9])) diff --git a/numpy/ma/tests/test_subclassing.py b/numpy/ma/tests/test_subclassing.py index ab0caf96b..54b202684 100644 --- a/numpy/ma/tests/test_subclassing.py +++ b/numpy/ma/tests/test_subclassing.py @@ -116,7 +116,7 @@ class TestSubclassing(TestCase): self.assertTrue(isinstance(hypot(mx,mx), mmatrix)) self.assertTrue(isinstance(hypot(mx,x), mmatrix)) - def test_masked_binary_operations(self): + def test_masked_binary_operations2(self): "Tests domained_masked_binary_operation" (x, mx) = self.data xmx = masked_array(mx.data.__array__(), mask=mx.mask) |