squash! WIP: store _param_ids_from/_param_ids_generated with Marks

pass _param_mark to Metafunc.parametrize

Author: blueyed

src/_pytest/python.py

@@ -10,6 +10,7 @@
 from functools import partial
 from textwrap import dedent
 from typing import List
+from typing import Optional
 from typing import Tuple
 
 import py
@@ -36,6 +37,7 @@
 from _pytest.main import FSHookProxy
 from _pytest.mark import MARK_GEN
 from _pytest.mark.structures import get_unpacked_marks
+from _pytest.mark.structures import Mark
 from _pytest.mark.structures import normalize_mark_list
 from _pytest.outcomes import fail
 from _pytest.outcomes import skip
@@ -132,25 +134,7 @@ def pytest_generate_tests(metafunc):
     _validate_parametrize_spelling(metafunc)
 
     for marker in metafunc.definition.iter_markers(name="parametrize"):
-        args, kwargs = marker.args, marker.kwargs
-        if marker._param_ids_from:
-            ids = marker._param_ids_from._param_ids_generated
-            if ids is None:
-                save_ids = True
-            else:
-                save_ids = False
-                if len(args) > 3:
-                    args = args.copy()
-                    args[3] = ids
-                else:
-                    assert "ids" in kwargs
-                    kwargs = kwargs.copy()
-                    kwargs["ids"] = ids
-
-        new_ids = metafunc.parametrize(*args, **kwargs)
-
-        if marker._param_ids_from and save_ids:
-            object.__setattr__(marker._param_ids_from, "_param_ids_generated", new_ids)
+        metafunc.parametrize(*marker.args, **marker.kwargs, _param_mark=marker)
 
 
 def pytest_configure(config):
@@ -947,7 +931,15 @@ def funcargnames(self):
         warnings.warn(FUNCARGNAMES, stacklevel=2)
         return self.fixturenames
 
-    def parametrize(self, argnames, argvalues, indirect=False, ids=None, scope=None):
+    def parametrize(
+        self,
+        argnames,
+        argvalues,
+        indirect=False,
+        ids=None,
+        scope=None,
+        _param_mark: Optional[Mark] = None,
+    ):
         """ Add new invocations to the underlying test function using the list
         of argvalues for the given argnames.  Parametrization is performed
         during the collection phase.  If you need to setup expensive resources
@@ -1018,8 +1010,16 @@ def parametrize(self, argnames, argvalues, indirect=False, ids=None, scope=None)
 
         arg_values_types = self._resolve_arg_value_types(argnames, indirect)
 
+        if _param_mark and _param_mark._param_ids_from:
+            generated_ids = _param_mark._param_ids_from._param_ids_generated
+            if generated_ids is not None:
+                ids = generated_ids
+
         ids = self._resolve_arg_ids(argnames, ids, parameters, item=self.definition)
 
+        if _param_mark and _param_mark._param_ids_from and generated_ids is None:
+            object.__setattr__(_param_mark._param_ids_from, "_param_ids_generated", ids)
+
         scopenum = scope2index(
             scope, descr="parametrize() call in {}".format(self.function.__name__)
         )
@@ -1042,7 +1042,6 @@ def parametrize(self, argnames, argvalues, indirect=False, ids=None, scope=None)
                 )
                 newcalls.append(newcallspec)
         self._calls = newcalls
-        return ids
 
     def _resolve_arg_ids(self, argnames, ids, parameters, item):
         """Resolves the actual ids for the given argnames, based on the ``ids`` parameter given