Fixed @pytest_fixture_plus in case it is used with parametrize and one parameter is itself customized using pytest.param. Fixed #29

Author: Sylvain MARIE

pytest_cases/main.py

@@ -295,11 +295,14 @@ def pytest_fixture_plus(scope="function",
                 if is_marked_parameter_value(v):
                     marks = get_marked_parameter_marks(v)
                     vals = get_marked_parameter_values(v)
-                    if len(vals) != 1:
+                    if len(vals) != len(_pnames):
                         raise ValueError("Internal error - unsupported pytest parametrization+mark combination. Please "
                                          "report this issue")
                     _pmarks.append(marks)  # there might be several
-                    _pvalues.append(vals[0])
+                    if len(vals) == 1:
+                        _pvalues.append(vals[0])
+                    else:
+                        _pvalues.append(vals)
                 else:
                     _pmarks.append(None)
                     _pvalues.append(v)

pytest_cases/tests/simple/test_fixtures_params.py

@@ -1,6 +1,15 @@
+from distutils.version import LooseVersion
+
 from pytest_cases import pytest_fixture_plus
 import pytest
 
+# pytest.param - not available in all versions
+if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+    pytest_param = pytest.param
+else:
+    def pytest_param(*args):
+        return args
+
 
 @pytest_fixture_plus(scope="module")
 @pytest.mark.parametrize("arg1", ["one", "two"])
@@ -18,7 +27,7 @@ def test_one(myfix):
 @pytest_fixture_plus
 @pytest.mark.parametrize("arg1, arg2", [
     (1, 2),
-    (3, 4),
+    pytest_param(3, 4),
 ])
 def myfix2(arg1, arg2):
     return arg1, arg2