|
26 | 26 | from .common_pytest_marks import has_pytest_param, get_param_argnames_as_list |
27 | 27 | from .common_pytest_lazy_values import is_lazy_value, is_lazy, get_lazy_args |
28 | 28 | from .common_pytest import get_fixture_name, remove_duplicates, mini_idvalset, is_marked_parameter_value, \ |
29 | | - extract_parameterset_info, ParameterSet, cart_product_pytest, mini_idval, inject_host, get_marked_parameter_values, \ |
30 | | - resolve_ids |
| 29 | + extract_parameterset_info, ParameterSet, cart_product_pytest, mini_idval, inject_host, \ |
| 30 | + get_marked_parameter_values, resolve_ids |
31 | 31 |
|
32 | 32 | from .fixture__creation import check_name_available, CHANGE, WARN |
33 | 33 | from .fixture_core1_unions import InvalidParamsList, NOT_USED, UnionFixtureAlternative, _make_fixture_union, \ |
@@ -538,8 +538,11 @@ def _create_params_alt(fh, test_func_name, union_name, from_i, to_i, hook): # n |
538 | 538 | argnames=argnames, argvalues_index=i, argvalues=argvals) |
539 | 539 | # Finally copy the custom id/marks on the ParamAlternative if any |
540 | 540 | if is_marked_parameter_value(marked_argvalues[i]): |
| 541 | + # TODO to support pytest 2 we should rather use our ParameterSet instead of pytest.param |
541 | 542 | p_fix_alt = pytest.param(p_fix_alt, id=marked_argvalues[i].id, marks=marked_argvalues[i].marks) |
542 | | - |
| 543 | + # p_fix_alt = ParameterSet(values=(p_fix_alt,), |
| 544 | + # id=get_marked_parameter_id(marked_argvalues[i]), |
| 545 | + # marks=get_marked_parameter_marks(marked_argvalues[i])) |
543 | 546 | else: |
544 | 547 | # Create a unique fixture name |
545 | 548 | p_fix_name = "%s_%s_is_P%stoP%s" % (test_func_name, param_names_str, from_i, to_i - 1) |
|
0 commit comments