changed tests

Author: tp

pandas/tests/frame/test_apply.py

@@ -1112,10 +1112,15 @@ def test_agg_function_input(self, cython_table_items, inputs, axis):
             with pytest.raises(expected):
                 # e.g. DataFrame(['a b'.split()]).cumprod() will raise
                 df.agg(np_func, axis=axis)
+            with pytest.raises(expected):
                 df.agg(str_func, axis=axis)
-        elif str_func in ('cumprod', 'cumsum'):
-            tm.assert_frame_equal(df.agg(np_func, axis=axis), expected)
-            tm.assert_frame_equal(df.agg(str_func, axis=axis), expected)
+            return
+
+        result = df.agg(np_func, axis=axis)
+        result_str_func = df.agg(str_func, axis=axis)
+        if str_func in ('cumprod', 'cumsum'):
+            tm.assert_frame_equal(result, expected)
+            tm.assert_frame_equal(result_str_func, expected)
         else:
-            tm.assert_series_equal(df.agg(np_func, axis=axis), expected)
-            tm.assert_series_equal(df.agg(str_func, axis=axis), expected)
+            tm.assert_series_equal(result, expected)
+            tm.assert_series_equal(result_str_func, expected)

pandas/tests/series/test_apply.py

@@ -384,13 +384,21 @@ def test_agg_function_input(self, inputs, cython_table_items):
         if isinstance(expected, type) and issubclass(expected, Exception):
             with pytest.raises(expected):
                 series.agg(np_func)
+            with pytest.raises(expected):
                 series.agg(str_func)
-        elif str_func in ('cumprod', 'cumsum'):
-            tm.assert_series_equal(series.agg(np_func), expected)
-            tm.assert_series_equal(series.agg(str_func), expected)
+            return
+
+        result = series.agg(np_func)
+        result_str_func = series.agg(str_func)
+        if str_func in ('cumprod', 'cumsum'):
+            tm.assert_series_equal(result, expected)
+            tm.assert_series_equal(result_str_func, expected)
+        elif tm.is_number(expected):
+            assert np.isclose(result, expected, equal_nan=True)
+            assert np.isclose(result_str_func, expected, equal_nan=True)
         else:
-            tm.assert_almost_equal(series.agg(np_func), expected)
-            tm.assert_almost_equal(series.agg(str_func), expected)
+            assert result == expected
+            assert result_str_func == expected
 
 
 class TestSeriesMap(TestData):