Skip to content

Commit 9a053b8

Browse files
author
tp
committed
changed tests
1 parent 396b327 commit 9a053b8

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

pandas/tests/frame/test_apply.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -1112,10 +1112,15 @@ def test_agg_function_input(self, cython_table_items, inputs, axis):
11121112
with pytest.raises(expected):
11131113
# e.g. DataFrame(['a b'.split()]).cumprod() will raise
11141114
df.agg(np_func, axis=axis)
1115+
with pytest.raises(expected):
11151116
df.agg(str_func, axis=axis)
1116-
elif str_func in ('cumprod', 'cumsum'):
1117-
tm.assert_frame_equal(df.agg(np_func, axis=axis), expected)
1118-
tm.assert_frame_equal(df.agg(str_func, axis=axis), expected)
1117+
return
1118+
1119+
result = df.agg(np_func, axis=axis)
1120+
result_str_func = df.agg(str_func, axis=axis)
1121+
if str_func in ('cumprod', 'cumsum'):
1122+
tm.assert_frame_equal(result, expected)
1123+
tm.assert_frame_equal(result_str_func, expected)
11191124
else:
1120-
tm.assert_series_equal(df.agg(np_func, axis=axis), expected)
1121-
tm.assert_series_equal(df.agg(str_func, axis=axis), expected)
1125+
tm.assert_series_equal(result, expected)
1126+
tm.assert_series_equal(result_str_func, expected)

pandas/tests/series/test_apply.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ def test_agg_function_input(self, inputs, cython_table_items):
389389
tm.assert_series_equal(series.agg(np_func), expected)
390390
tm.assert_series_equal(series.agg(str_func), expected)
391391
else:
392-
tm.assert_almost_equal(series.agg(np_func), expected)
393-
tm.assert_almost_equal(series.agg(str_func), expected)
392+
np.isclose(series.agg(np_func), expected)
393+
np.isclose(series.agg(str_func), expected)
394394

395395

396396
class TestSeriesMap(TestData):

0 commit comments

Comments
 (0)