Skip to content

Commit c10c0b8

Browse files
jbrockmendelPingviinituutti
authored andcommitted
TST: Use new arithmetic fixtures, parametrize many more tests (pandas-dev#23757)
1 parent 9b38c24 commit c10c0b8

File tree

6 files changed

+455
-402
lines changed

6 files changed

+455
-402
lines changed

pandas/tests/arithmetic/conftest.py

+4-30
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import pandas as pd
66

77
from pandas.compat import long
8-
from pandas.core.arrays import (
9-
PeriodArray, DatetimeArrayMixin as DatetimeArray,
10-
TimedeltaArrayMixin as TimedeltaArray)
118
import pandas.util.testing as tm
129

1310

@@ -189,33 +186,6 @@ def box_transpose_fail(request):
189186
return request.param
190187

191188

192-
@pytest.fixture(params=[pd.Index, pd.Series, pd.DataFrame, PeriodArray],
193-
ids=id_func)
194-
def box_with_period(request):
195-
"""
196-
Like `box`, but specific to PeriodDtype for also testing PeriodArray
197-
"""
198-
return request.param
199-
200-
201-
@pytest.fixture(params=[pd.Index, pd.Series, pd.DataFrame, DatetimeArray],
202-
ids=id_func)
203-
def box_with_datetime(request):
204-
"""
205-
Like `box`, but specific to datetime64 for also testing DatetimeArray
206-
"""
207-
return request.param
208-
209-
210-
@pytest.fixture(params=[pd.Index, pd.Series, pd.DataFrame, TimedeltaArray],
211-
ids=id_func)
212-
def box_with_timedelta(request):
213-
"""
214-
Like `box`, but specific to timedelta64 for also testing TimedeltaArray
215-
"""
216-
return request.param
217-
218-
219189
@pytest.fixture(params=[pd.Index, pd.Series, pd.DataFrame, tm.to_array],
220190
ids=id_func)
221191
def box_with_array(request):
@@ -224,3 +194,7 @@ def box_with_array(request):
224194
classes
225195
"""
226196
return request.param
197+
198+
199+
# alias so we can use the same fixture for multiple parameters in a test
200+
box_with_array2 = box_with_array

0 commit comments

Comments
 (0)