Skip to content

Commit 05a1f53

Browse files
RonnyPfannschmidtpatchback[bot]
authored andcommitted
Merge pull request #15374 from pytest-dev/claude/project-thread-vvbrcl
Store raw parametrize ids on a shared mark, not resolved ones (cherry picked from commit fc9a7ef)
1 parent 9bc284a commit 05a1f53

4 files changed

Lines changed: 21 additions & 12 deletions

File tree

‎changelog/15370.bugfix.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed :ref:`@pytest.mark.parametrize <pytest.mark.parametrize ref>` ``ids`` being escaped again for every further test sharing the mark (for example on a class, or across repeated :func:`pytest.main` calls): the mark now stores the raw ids instead of the resolved ones.

‎src/_pytest/mark/structures.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ class Mark:
284284

285285
#: Source Mark for ids with parametrize Marks.
286286
_param_ids_from: Mark | None = dataclasses.field(default=None, repr=False)
287-
#: Resolved/generated ids with parametrize Marks.
288-
_param_ids_generated: Sequence[str] | None = dataclasses.field(
287+
#: Materialized (unresolved) ids with parametrize Marks.
288+
_param_ids_generated: Sequence[object | None] | None = dataclasses.field(
289289
default=None, repr=False
290290
)
291291

@@ -295,7 +295,7 @@ def __init__(
295295
args: tuple[Any, ...],
296296
kwargs: Mapping[str, Any],
297297
param_ids_from: Mark | None = None,
298-
param_ids_generated: Sequence[str] | None = None,
298+
param_ids_generated: Sequence[object | None] | None = None,
299299
*,
300300
_ispytest: bool = False,
301301
) -> None:

‎src/_pytest/python.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,20 +1417,20 @@ def parametrize(
14171417

14181418
self._validate_if_using_arg_names(argnames, indirect)
14191419

1420-
# Use any already (possibly) generated ids with parametrize Marks.
1421-
if _param_mark and _param_mark._param_ids_from:
1422-
generated_ids = _param_mark._param_ids_from._param_ids_generated
1423-
if generated_ids is not None:
1424-
ids = generated_ids
1420+
# Store the raw ids on the source parametrize Mark, so that an iterator
1421+
# (#759) is consumed only once by all tests sharing the mark. They are
1422+
# resolved (escaped, made unique) on every call.
1423+
if _param_mark and (source := _param_mark._param_ids_from):
1424+
if source._param_ids_generated is not None:
1425+
ids = source._param_ids_generated
1426+
elif ids is not None and not callable(ids):
1427+
ids = self._validate_ids(ids, parametersets)
1428+
object.__setattr__(source, "_param_ids_generated", ids)
14251429

14261430
ids = self._resolve_parameter_set_ids(
14271431
argnames, ids, parametersets, nodeid=self.definition.nodeid
14281432
)
14291433

1430-
# Store used (possibly generated) ids with parametrize Marks.
1431-
if _param_mark and _param_mark._param_ids_from and generated_ids is None:
1432-
object.__setattr__(_param_mark._param_ids_from, "_param_ids_generated", ids)
1433-
14341434
# Calculate directness.
14351435
arg_directness = _resolve_args_directness(
14361436
argnames, indirect, self.definition.nodeid

‎testing/python/metafunc.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,14 @@ def func(x, y):
333333
ids = [x.id for x in metafunc._calls]
334334
assert ids == ["4-6", "4-7", "5-6", "5-7"]
335335

336+
def test_parametrize_ids_shared_mark_resolved_once(self) -> None:
337+
"""Ids stored on a shared mark are raw, not resolved again (#15370)."""
338+
mark = pytest.mark.parametrize("x", [1], ids=iter(["a\nb"])).mark
339+
for _ in range(2):
340+
metafunc = self.Metafunc(lambda x: None)
341+
metafunc.parametrize(*mark.args, **mark.kwargs, _param_mark=mark)
342+
assert [c.id for c in metafunc._calls] == ["a\\nb"]
343+
336344
def test_parametrize_empty_list(self) -> None:
337345
"""#510"""
338346

0 commit comments

Comments
 (0)