Fixed minor issue where empty entries could be present in currentcases. Fixes #213

Author: Sylvain MARIE

pytest_cases/case_parametrizer_new.py

@@ -879,7 +879,13 @@ def get_current_cases(request_or_item):
                             argval = LazyTupleItem(argvals, item)
                             _possibly_add_cases_to_results(request, fix_results, mp_fix_to_args, argname, argval)
                     else:
-                        print()
+                        # not lazy = normal parameter = there is no way this is a case
+                        pass
+
+            # cleanup: delete the empty subdict if the params were not cases.
+            if len(fix_results) == 0:
+                del results[argname_or_fixturename]
+
 
         # (2) Parameters on a test function, or parameters on a fixture with a fixture_ref inside (other fixture gen)
         else:
@@ -944,9 +950,18 @@ def _possibly_add_cases_to_results(request, results, mp_fix_to_args, argname_or_
             return
 
     # If the parametrization target is not the test but a fixture, store the cases in a dub-dict
+    orig_results = None
     if parametrized is not None and parametrized.__name__ != request.node.function.__name__:
+        # store the wrapping dict because we'll delete this entry in the end if it is empty
+        orig_results = results
         results = _get_or_create_subdict(results, parametrized.__name__)
 
+    # this function will need to be called before returning
+    def _cleanup_before_return():
+        # remove the subdict if it was created for nothing
+        if orig_results is not None and len(results) == 0:
+            del orig_results[parametrized.__name__]
+
     # If we did not yet find the case function, this is because this was a simple parametrize without fixture ref.
     if case_func is None:
         if isinstance(current_param_value, LazyTupleItem):
@@ -964,10 +979,12 @@ def _possibly_add_cases_to_results(request, results, mp_fix_to_args, argname_or_
 
         elif current_param_value in (NOT_USED, USED):
             # ignore silently
+            _cleanup_before_return()
             return
         else:
             # raise TypeError("Internal error - type not expected : %r" % type(current_param_value))
             # some other parameter - return silently
+            _cleanup_before_return()
             return
 
     # Finally do it
@@ -981,6 +998,8 @@ def _possibly_add_cases_to_results(request, results, mp_fix_to_args, argname_or_
             raise ValueError("Internal error - please report")
         results[argname] = (actual_id, case_func)
 
+    _cleanup_before_return()
+
 
 def _get_or_create_subdict(dct, key):
     try:

pytest_cases/tests/cases/doc/test_get_current_cases_negative.py

@@ -2,7 +2,7 @@
 #          + All contributors to <https://github.com/smarie/python-pytest-cases>
 #
 # License: 3-clause BSD, <https://github.com/smarie/python-pytest-cases/blob/master/LICENSE>
-from pytest_cases import fixture, get_current_cases, parametrize, lazy_value, fixture_ref
+from pytest_cases import fixture, get_current_cases, parametrize, lazy_value, fixture_ref, parametrize_with_cases
 
 
 def foo():
@@ -20,3 +20,32 @@ def foo_fix():
 def test_foo(a, a1, a2, b1, b2, current_cases, request):
     assert current_cases == {}
     assert get_current_cases(request) == {}
+
+
+# ----------- fix for issue 213
+
+@parametrize(name=("bar", ))
+def case_foo2(name):
+    return name
+
+
+@parametrize_with_cases("a", cases=case_foo2)
+def test_foo2(a, current_cases):
+    assert current_cases == {'a': ('foo2', case_foo2)}
+
+
+# ----------- fix for issue 213 bis
+
+@fixture
+def o():
+    return "name"
+
+
+@fixture
+@parametrize("a", (fixture_ref(o), 'r'))
+def a_fix(a):
+    return a
+
+
+def test_foo3(a_fix, current_cases):
+    assert current_cases == {}