Skip to content

Commit b6a852e

Browse files
author
Sylvain MARIE
committed
@cases_generator now has a default value for the names template, based on the parameters. Fixes #77
1 parent 8950796 commit b6a852e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

pytest_cases/main_params.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,11 @@ def _get_case_getter_s(f,
400400
already_used_names = []
401401

402402
names, param_ids, all_param_values_combinations = gen
403+
nb_cases_generated = len(all_param_values_combinations)
404+
405+
if names is None:
406+
# default template based on parameter names
407+
names = "%s__%s" % (f.__name__, ', '.join("%s={%s}" % (p_name, p_name) for p_name in param_ids))
403408

404409
if isinstance(names, string_types):
405410
# then this is a string formatter creating the names. Create the corresponding callable
@@ -410,7 +415,6 @@ def names(**params):
410415
except Exception:
411416
raise InvalidNamesTemplateException(f, _formatter, params)
412417

413-
nb_cases_generated = len(all_param_values_combinations)
414418
if not callable(names):
415419
# This is an explicit list
416420
if len(names) != nb_cases_generated:

pytest_cases/tests/advanced/test_parameters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def case_simple2(version # type: str
2828
return ins, outs, None
2929

3030

31-
@cases_generator("gen case i={i}, j={j}", i=range(2), j=range(2))
31+
@cases_generator(i=range(2), j=range(2))
3232
def case_gen(version, # type: str,
3333
i, j):
3434
# type: (...) -> CaseData

0 commit comments

Comments
 (0)