Skip to content

Commit e0d6051

Browse files
authored
TST: Replace node.add_marker with applymarker (#55513)
1 parent 7b8c6f6 commit e0d6051

File tree

74 files changed

+216
-242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+216
-242
lines changed

doc/source/development/contributing_codebase.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ xfail during the testing phase. To do so, use the ``request`` fixture:
540540
541541
def test_xfail(request):
542542
mark = pytest.mark.xfail(raises=TypeError, reason="Indicate why here")
543-
request.node.add_marker(mark)
543+
request.applymarker(mark)
544544
545545
xfail is not to be used for tests involving failure due to invalid user arguments.
546546
For these tests, we need to verify the correct exception type and error message

pandas/tests/apply/test_frame_apply.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ def test_apply_empty_infer_type(ax, func, raw, axis, engine, request):
325325
mark = pytest.mark.xfail(
326326
reason="numba engine only supports raw=True at the moment"
327327
)
328-
request.node.add_marker(mark)
328+
request.applymarker(mark)
329329

330330
result = df.apply(func, axis=axis, engine=engine, raw=raw)
331331
if is_reduction:

pandas/tests/apply/test_frame_transform.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def func(x):
156156
def test_transform_bad_dtype(op, frame_or_series, request):
157157
# GH 35964
158158
if op == "ngroup":
159-
request.node.add_marker(
159+
request.applymarker(
160160
pytest.mark.xfail(raises=ValueError, reason="ngroup not valid for NDFrame")
161161
)
162162

@@ -185,7 +185,7 @@ def test_transform_failure_typeerror(request, op):
185185
# GH 35964
186186

187187
if op == "ngroup":
188-
request.node.add_marker(
188+
request.applymarker(
189189
pytest.mark.xfail(raises=ValueError, reason="ngroup not valid for NDFrame")
190190
)
191191

pandas/tests/apply/test_series_apply.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def test_transform(string_series, by_row):
321321
def test_transform_partial_failure(op, request):
322322
# GH 35964
323323
if op in ("ffill", "bfill", "pad", "backfill", "shift"):
324-
request.node.add_marker(
324+
request.applymarker(
325325
pytest.mark.xfail(reason=f"{op} is successful on any dtype")
326326
)
327327

pandas/tests/apply/test_str.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
@pytest.mark.parametrize("how", ["agg", "apply"])
3232
def test_apply_with_string_funcs(request, float_frame, func, args, kwds, how):
3333
if len(args) > 1 and how == "agg":
34-
request.node.add_marker(
34+
request.applymarker(
3535
pytest.mark.xfail(
3636
raises=TypeError,
3737
reason="agg/apply signature mismatch - agg passes 2nd "
@@ -256,7 +256,7 @@ def test_agg_cython_table_transform_frame(df, func, expected, axis):
256256
def test_transform_groupby_kernel_series(request, string_series, op):
257257
# GH 35964
258258
if op == "ngroup":
259-
request.node.add_marker(
259+
request.applymarker(
260260
pytest.mark.xfail(raises=ValueError, reason="ngroup not valid for NDFrame")
261261
)
262262
args = [0.0] if op == "fillna" else []
@@ -269,7 +269,7 @@ def test_transform_groupby_kernel_series(request, string_series, op):
269269
@pytest.mark.parametrize("op", frame_transform_kernels)
270270
def test_transform_groupby_kernel_frame(request, axis, float_frame, op):
271271
if op == "ngroup":
272-
request.node.add_marker(
272+
request.applymarker(
273273
pytest.mark.xfail(raises=ValueError, reason="ngroup not valid for NDFrame")
274274
)
275275

pandas/tests/arithmetic/test_datetime64.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ def test_dt64arr_addsub_intlike(
10841084
# GH#19959, GH#19123, GH#19012
10851085
tz = tz_naive_fixture
10861086
if box_with_array is pd.DataFrame:
1087-
request.node.add_marker(
1087+
request.applymarker(
10881088
pytest.mark.xfail(raises=ValueError, reason="Axis alignment fails")
10891089
)
10901090

pandas/tests/arrays/string_/test_string.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def test_add_2d(dtype, request, arrow_string_storage):
151151
if dtype.storage in arrow_string_storage:
152152
reason = "Failed: DID NOT RAISE <class 'ValueError'>"
153153
mark = pytest.mark.xfail(raises=None, reason=reason)
154-
request.node.add_marker(mark)
154+
request.applymarker(mark)
155155

156156
a = pd.array(["a", "b", "c"], dtype=dtype)
157157
b = np.array([["a", "b", "c"]], dtype=object)
@@ -180,7 +180,7 @@ def test_mul(dtype, request, arrow_string_storage):
180180
if dtype.storage in arrow_string_storage:
181181
reason = "unsupported operand type(s) for *: 'ArrowStringArray' and 'int'"
182182
mark = pytest.mark.xfail(raises=NotImplementedError, reason=reason)
183-
request.node.add_marker(mark)
183+
request.applymarker(mark)
184184

185185
a = pd.array(["a", "b", None], dtype=dtype)
186186
result = a * 2
@@ -446,7 +446,7 @@ def test_min_max_numpy(method, box, dtype, request, arrow_string_storage):
446446
else:
447447
reason = "'ArrowStringArray' object has no attribute 'max'"
448448
mark = pytest.mark.xfail(raises=TypeError, reason=reason)
449-
request.node.add_marker(mark)
449+
request.applymarker(mark)
450450

451451
arr = box(["a", "b", "c", None], dtype=dtype)
452452
result = getattr(np, method)(arr)

pandas/tests/base/test_conversion.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def test_to_numpy(arr, expected, index_or_series_or_array, request):
337337

338338
if arr.dtype.name == "int64" and box is pd.array:
339339
mark = pytest.mark.xfail(reason="thing is Int64 and to_numpy() returns object")
340-
request.node.add_marker(mark)
340+
request.applymarker(mark)
341341

342342
result = thing.to_numpy()
343343
tm.assert_numpy_array_equal(result, expected)

pandas/tests/base/test_misc.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def test_searchsorted(request, index_or_series_obj):
141141

142142
if isinstance(obj, pd.MultiIndex):
143143
# See gh-14833
144-
request.node.add_marker(
144+
request.applymarker(
145145
pytest.mark.xfail(
146146
reason="np.searchsorted doesn't work on pd.MultiIndex: GH 14833"
147147
)
@@ -150,7 +150,7 @@ def test_searchsorted(request, index_or_series_obj):
150150
# TODO: Should Series cases also raise? Looks like they use numpy
151151
# comparison semantics https://github.com/numpy/numpy/issues/15981
152152
mark = pytest.mark.xfail(reason="complex objects are not comparable")
153-
request.node.add_marker(mark)
153+
request.applymarker(mark)
154154

155155
max_obj = max(obj, default=0)
156156
index = np.searchsorted(obj, max_obj)

pandas/tests/computation/test_eval.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def test_compound_invert_op(self, op, lhs, rhs, request, engine, parser):
194194
reason="Looks like expected is negative, unclear whether "
195195
"expected is incorrect or result is incorrect"
196196
)
197-
request.node.add_marker(mark)
197+
request.applymarker(mark)
198198
skip_these = ["in", "not in"]
199199
ex = f"~(lhs {op} rhs)"
200200

@@ -860,7 +860,7 @@ def test_basic_series_frame_alignment(
860860
f"parser={parser}, index_name={index_name}, "
861861
f"r_idx_type={r_idx_type}, c_idx_type={c_idx_type}"
862862
)
863-
request.node.add_marker(pytest.mark.xfail(reason=reason, strict=False))
863+
request.applymarker(pytest.mark.xfail(reason=reason, strict=False))
864864
df = tm.makeCustomDataframe(
865865
10, 7, data_gen_f=f, r_idx_type=r_idx_type, c_idx_type=c_idx_type
866866
)
@@ -1883,7 +1883,7 @@ def test_negate_lt_eq_le(engine, parser):
18831883
def test_eval_no_support_column_name(request, column):
18841884
# GH 44603
18851885
if column in ["True", "False", "inf", "Inf"]:
1886-
request.node.add_marker(
1886+
request.applymarker(
18871887
pytest.mark.xfail(
18881888
raises=KeyError,
18891889
reason=f"GH 47859 DataFrame eval not supported with {column}",

pandas/tests/copy_view/test_core_functionalities.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_setitem_with_view_invalidated_does_not_copy(using_copy_on_write, reques
5757
mark = pytest.mark.xfail(
5858
reason="blk.delete does not track references correctly"
5959
)
60-
request.node.add_marker(mark)
60+
request.applymarker(mark)
6161
assert np.shares_memory(arr, get_array(df, "a"))
6262

6363

pandas/tests/extension/decimal/test_decimal.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ def check_reduce(self, ser: pd.Series, op_name: str, skipna: bool):
8585
def test_reduce_series_numeric(self, data, all_numeric_reductions, skipna, request):
8686
if all_numeric_reductions in ["kurt", "skew", "sem", "median"]:
8787
mark = pytest.mark.xfail(raises=NotImplementedError)
88-
request.node.add_marker(mark)
88+
request.applymarker(mark)
8989
super().test_reduce_series_numeric(data, all_numeric_reductions, skipna)
9090

9191
def test_reduce_frame(self, data, all_numeric_reductions, skipna, request):
9292
op_name = all_numeric_reductions
9393
if op_name in ["skew", "median"]:
9494
mark = pytest.mark.xfail(raises=NotImplementedError)
95-
request.node.add_marker(mark)
95+
request.applymarker(mark)
9696

9797
return super().test_reduce_frame(data, all_numeric_reductions, skipna)
9898

pandas/tests/extension/json/test_json.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ def test_equals_same_data_different_object(
237237
):
238238
if using_copy_on_write:
239239
mark = pytest.mark.xfail(reason="Fails with CoW")
240-
request.node.add_marker(mark)
240+
request.applymarker(mark)
241241
super().test_equals_same_data_different_object(data)
242242

243243

@@ -300,15 +300,15 @@ class TestArithmeticOps(BaseJSON, base.BaseArithmeticOpsTests):
300300
def test_arith_frame_with_scalar(self, data, all_arithmetic_operators, request):
301301
if len(data[0]) != 1:
302302
mark = pytest.mark.xfail(reason="raises in coercing to Series")
303-
request.node.add_marker(mark)
303+
request.applymarker(mark)
304304
super().test_arith_frame_with_scalar(data, all_arithmetic_operators)
305305

306306

307307
class TestComparisonOps(BaseJSON, base.BaseComparisonOpsTests):
308308
def test_compare_array(self, data, comparison_op, request):
309309
if comparison_op.__name__ in ["eq", "ne"]:
310310
mark = pytest.mark.xfail(reason="Comparison methods not implemented")
311-
request.node.add_marker(mark)
311+
request.applymarker(mark)
312312
super().test_compare_array(data, comparison_op)
313313

314314

0 commit comments

Comments
 (0)