Fixed issue with get_current_case_id in case of multiple argnames. Added corresponding test. Fixes #189

Author: Sylvain MARIE

docs/api_reference.md

@@ -292,7 +292,7 @@ argvalues = get_parametrize_args(host_class_or_module_of_f, cases_funs)
 
 ```python
 def get_current_case_id(request_or_item, 
-                        argnames: str
+                        argnames: Union[Iterable[str], str]
                         ):
 ```
 

pytest_cases/case_parametrizer_new.py

@@ -18,8 +18,9 @@
 
 from .common_mini_six import string_types
 from .common_others import get_code_first_line, AUTO, qname, funcopy
-from .common_pytest_marks import copy_pytest_marks, make_marked_parameter_value, remove_pytest_mark, filter_marks
-from .common_pytest_lazy_values import lazy_value
+from .common_pytest_marks import copy_pytest_marks, make_marked_parameter_value, remove_pytest_mark, filter_marks, \
+    get_param_argnames_as_list
+from .common_pytest_lazy_values import lazy_value, LazyTupleItem
 from .common_pytest import safe_isclass, MiniMetafunc, is_fixture, get_fixture_name, inject_host, add_fixture_params
 
 from . import fixture
@@ -721,7 +722,7 @@ def _of_interest(x):  # noqa
 
 
 def get_current_case_id(request_or_item,
-                        argnames  # type: str
+                        argnames  # type: Union[Iterable[str], str]
                         ):
     """
     A helper function to return the current case id for a given `pytest` item (available in some hooks) or `request`
@@ -739,16 +740,23 @@ def get_current_case_id(request_or_item,
     except AttributeError:
         item = request_or_item
 
+    # process argnames
+    if isinstance(argnames, string_types):
+        argnames = get_param_argnames_as_list(argnames)
+    argnames_str = '_'.join(argnames).replace(' ', '')
+
     try:
-        # A LazyValue ?
-        lazy_val = item.callspec.params[argnames]
+        # A LazyValue or LazyTupleItem ?
+        lazy_val = item.callspec.params[argnames[0]]
     except KeyError:
         # No: A fixture union created by `parametrize_plus_decorate`
         main_fixture_style_template = "%s_%s"
-        fixture_union_name = main_fixture_style_template % (item.function.__name__, argnames)
+        fixture_union_name = main_fixture_style_template % (item.function.__name__, argnames_str)
         return item.callspec.params[fixture_union_name].get_alternative_id()
     else:
-        # A lazyvalue - confirmed
+        # A LazyValue or LazyTupleItem - confirmed.
+        if isinstance(lazy_val, LazyTupleItem):
+            lazy_val = lazy_val.host
         return lazy_val.get_id()
 
 

pytest_cases/tests/cases/doc/test_get_current_case_id.py

@@ -2,23 +2,33 @@
 
 
 def data_b():
-    return 1
+    return 1, 2
 
 
 @parametrize_with_cases("data", cases=data_b, prefix="data_")
 def test_lazy_val_case(data, request):
     assert get_current_case_id(request, "data") == "b"
 
 
+@parametrize_with_cases("data,data2", cases=data_b, prefix="data_")
+def test_lazy_val_case_2_args(data, data2, request):
+    assert get_current_case_id(request, ["data", "data2"]) == "b"
+
+
 @fixture
 def a():
     return
 
 
 def data_a(a):
-    return 1
+    return 1, 2
 
 
 @parametrize_with_cases("data", cases=data_a, prefix="data_")
 def test_fixture_case(data, request):
     assert get_current_case_id(request.node, "data") == "a"
+
+
+@parametrize_with_cases("data,data2", cases=data_a, prefix="data_")
+def test_fixture_case_2_args(data, data2, request):
+    assert get_current_case_id(request.node, "data,data2") == "a"