Skip to content

Commit 620555e

Browse files
committed
Fix tests
1 parent ff7f00d commit 620555e

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

pandas/tests/groupby/test_groupby.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2008,7 +2008,9 @@ def test_pivot_table_values_key_error():
20082008
@pytest.mark.parametrize(
20092009
"op", ["idxmax", "idxmin", "min", "max", "sum", "prod", "skew"]
20102010
)
2011-
def test_empty_groupby(columns, keys, values, method, op, using_array_manager, dropna):
2011+
def test_empty_groupby(
2012+
columns, keys, values, method, op, using_array_manager, dropna, using_infer_string
2013+
):
20122014
# GH8093 & GH26411
20132015
override_dtype = None
20142016

@@ -2049,7 +2051,11 @@ def get_categorical_invalid_expected():
20492051
# Categorical is special without 'observed=True'
20502052
idx = Index(lev, name=keys[0])
20512053

2052-
expected = DataFrame([], columns=[], index=idx)
2054+
if using_infer_string:
2055+
columns = Index([], dtype="string[pyarrow_numpy]")
2056+
else:
2057+
columns = []
2058+
expected = DataFrame([], columns=columns, index=idx)
20532059
return expected
20542060

20552061
is_per = isinstance(df.dtypes.iloc[0], pd.PeriodDtype)

pandas/tests/groupby/test_raises.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def test_groupby_raises_string(
189189
"sum": (None, ""),
190190
"var": (
191191
TypeError,
192-
re.escape("agg function failed [how->var,dtype->object]"),
192+
re.escape("agg function failed [how->var,dtype->"),
193193
),
194194
}[groupby_func]
195195

0 commit comments

Comments
 (0)