Skip to content

Commit 34382db

Browse files
committed
Update test_regression_whitelist_methods, remove specialized test
1 parent 8c52aba commit 34382db

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

pandas/tests/groupby/test_function.py

-19
Original file line numberDiff line numberDiff line change
@@ -490,25 +490,6 @@ def test_ops_general():
490490
raise
491491

492492

493-
@pytest.mark.parametrize('as_index', [True, False])
494-
def test_groupby_std(as_index):
495-
# GH 10355: Test that std does not affect the groupby column
496-
df = pd.DataFrame({
497-
'a': [1, 1, 1, 2, 2, 2, 3, 3, 3],
498-
'b': [1, 2, 3, 3, 5, 7, 7, 8, 9],
499-
})
500-
result = df.groupby('a', as_index=as_index).std()
501-
expected = pd.DataFrame({
502-
'a': [1, 2, 3],
503-
'b': [1, 2, 1]
504-
})
505-
506-
if as_index:
507-
expected = expected.set_index('a')
508-
509-
tm.assert_frame_equal(result, expected)
510-
511-
512493
def test_max_nan_bug():
513494
raw = """,Date,app,File
514495
-04-23,2013-04-23 00:00:00,,log080001.log

pandas/tests/groupby/test_whitelist.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def test_regression_whitelist_methods(
180180
else:
181181
frame = raw_frame.T
182182

183-
groupby_kwargs = {'level': level, 'axis': axis, 'sort': sort} #, 'as_index': as_index}
183+
groupby_kwargs = {'level': level, 'axis': axis, 'sort': sort, 'as_index': as_index}
184184
group_op_kwargs = {}
185185
frame_op_kwargs = {'level': level, 'axis': axis}
186186
if op in AGG_FUNCTIONS_WITH_SKIPNA:
@@ -190,12 +190,17 @@ def test_regression_whitelist_methods(
190190
grouped = frame.groupby(**groupby_kwargs)
191191
result = getattr(grouped, op)(**group_op_kwargs)
192192
expected = getattr(frame, op)(**frame_op_kwargs)
193-
if as_index:
194-
pass
195193

196194
if sort:
197195
expected = expected.sort_index(axis=axis, level=level)
198196

197+
if not as_index:
198+
expected = expected.reset_index()
199+
if level == 0:
200+
expected = expected.drop(columns=['first'])
201+
if level == 1:
202+
expected = expected.drop(columns=['second'])
203+
199204
tm.assert_frame_equal(result, expected)
200205

201206

0 commit comments

Comments
 (0)