Merge pull request numpy#3403 from juliantaylor/test-multi-dec

TST: fix some function name conflicts

numpy/core/tests/test_multiarray.py

@@ -1207,7 +1207,7 @@ def test_assign_mask(self):
         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)

numpy/core/tests/test_umath.py

@@ -348,7 +348,7 @@ def test_nan_outputs(self):
         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)

numpy/ma/tests/test_old_ma.py

@@ -423,7 +423,7 @@ def test_testOddFeatures(self):
         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]))

numpy/ma/tests/test_subclassing.py

@@ -116,7 +116,7 @@ def test_masked_binary_operations(self):
         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)