Merge branch 'parametrize'. Fix #28.

Author: RKrahl

doc/examples/dyn-parametrized.py

@@ -26,13 +26,14 @@ def __str__(self):
 # Create enriched parameter lists, decorated with the dependency marker.
 
 childparam = [ 
-    pytest.mark.dependency(name="test_child[%s]" % c)(c) for c in childs
+    pytest.param(c, marks=pytest.mark.dependency(name="test_child[%s]" % c)) 
+    for c in childs
 ]
 parentparam = [
-    pytest.mark.dependency(
+    pytest.param(p, marks=pytest.mark.dependency(
         name="test_parent[%s]" % p, 
         depends=["test_child[%s]" % c for c in p.children]
-    )(p) for p in parents
+    )) for p in parents
 ]
 
 @pytest.mark.parametrize("c", childparam)

doc/examples/parametrized.py

@@ -1,29 +1,39 @@
 import pytest
 
 @pytest.mark.parametrize("x,y", [
-    pytest.mark.dependency(name="a1")((0,0)),
-    pytest.mark.dependency(name="a2")(pytest.mark.xfail((0,1))),
-    pytest.mark.dependency(name="a3")((1,0)),
-    pytest.mark.dependency(name="a4")((1,1))
+    pytest.param(0, 0, marks=pytest.mark.dependency(name="a1")),
+    pytest.param(0, 1, marks=[pytest.mark.dependency(name="a2"),
+                              pytest.mark.xfail]),
+    pytest.param(1, 0, marks=pytest.mark.dependency(name="a3")),
+    pytest.param(1, 1, marks=pytest.mark.dependency(name="a4"))
 ])
 def test_a(x,y):
     assert y <= x
 
 @pytest.mark.parametrize("u,v", [
-    pytest.mark.dependency(name="b1", depends=["a1", "a2"])((1,2)),
-    pytest.mark.dependency(name="b2", depends=["a1", "a3"])((1,3)),
-    pytest.mark.dependency(name="b3", depends=["a1", "a4"])((1,4)),
-    pytest.mark.dependency(name="b4", depends=["a2", "a3"])((2,3)),
-    pytest.mark.dependency(name="b5", depends=["a2", "a4"])((2,4)),
-    pytest.mark.dependency(name="b6", depends=["a3", "a4"])((3,4))
+    pytest.param(1, 2, marks=pytest.mark.dependency(name="b1", 
+                                                    depends=["a1", "a2"])),
+    pytest.param(1, 3, marks=pytest.mark.dependency(name="b2", 
+                                                    depends=["a1", "a3"])),
+    pytest.param(1, 4, marks=pytest.mark.dependency(name="b3", 
+                                                    depends=["a1", "a4"])),
+    pytest.param(2, 3, marks=pytest.mark.dependency(name="b4", 
+                                                    depends=["a2", "a3"])),
+    pytest.param(2, 4, marks=pytest.mark.dependency(name="b5", 
+                                                    depends=["a2", "a4"])),
+    pytest.param(3, 4, marks=pytest.mark.dependency(name="b6", 
+                                                    depends=["a3", "a4"]))
 ])
 def test_b(u,v):
     pass
 
 @pytest.mark.parametrize("w", [
-    pytest.mark.dependency(name="c1", depends=["b1", "b2", "b6"])(1),
-    pytest.mark.dependency(name="c2", depends=["b2", "b3", "b6"])(2),
-    pytest.mark.dependency(name="c3", depends=["b2", "b4", "b6"])(3)
+    pytest.param(1, marks=pytest.mark.dependency(name="c1", 
+                                                 depends=["b1", "b2", "b6"])),
+    pytest.param(2, marks=pytest.mark.dependency(name="c2", 
+                                                 depends=["b2", "b3", "b6"])),
+    pytest.param(3, marks=pytest.mark.dependency(name="c3", 
+                                                 depends=["b2", "b4", "b6"]))
 ])
 def test_c(w):
     pass

tests/test_03_param.py

@@ -8,30 +8,32 @@ def test_multiple(ctestdir):
     ctestdir.makepyfile("""
         import pytest
 
+        _md = pytest.mark.dependency
+
         @pytest.mark.parametrize("x,y", [
-            pytest.mark.dependency(name="a1")((0,0)),
-            pytest.mark.dependency(name="a2")((0,1)),
-            pytest.mark.dependency(name="a3")((1,0)),
-            pytest.mark.dependency(name="a4")((1,1))
+            pytest.param(0, 0, marks=_md(name="a1")),
+            pytest.param(0, 1, marks=_md(name="a2")),
+            pytest.param(1, 0, marks=_md(name="a3")),
+            pytest.param(1, 1, marks=_md(name="a4"))
         ])
         def test_a(x,y):
             assert x==0 or y==0
 
         @pytest.mark.parametrize("u,v", [
-            pytest.mark.dependency(name="b1", depends=["a1", "a2"])((1,2)),
-            pytest.mark.dependency(name="b2", depends=["a1", "a3"])((1,3)),
-            pytest.mark.dependency(name="b3", depends=["a1", "a4"])((1,4)),
-            pytest.mark.dependency(name="b4", depends=["a2", "a3"])((2,3)),
-            pytest.mark.dependency(name="b5", depends=["a2", "a4"])((2,4)),
-            pytest.mark.dependency(name="b6", depends=["a3", "a4"])((3,4))
+            pytest.param(1, 2, marks=_md(name="b1", depends=["a1", "a2"])),
+            pytest.param(1, 3, marks=_md(name="b2", depends=["a1", "a3"])),
+            pytest.param(1, 4, marks=_md(name="b3", depends=["a1", "a4"])),
+            pytest.param(2, 3, marks=_md(name="b4", depends=["a2", "a3"])),
+            pytest.param(2, 4, marks=_md(name="b5", depends=["a2", "a4"])),
+            pytest.param(3, 4, marks=_md(name="b6", depends=["a3", "a4"]))
         ])
         def test_b(u,v):
             pass
 
         @pytest.mark.parametrize("w", [
-            pytest.mark.dependency(name="c1", depends=["b1", "b3", "b5"])(1),
-            pytest.mark.dependency(name="c2", depends=["b1", "b3", "b6"])(2),
-            pytest.mark.dependency(name="c3", depends=["b1", "b2", "b4"])(3)
+            pytest.param(1, marks=_md(name="c1", depends=["b1", "b3", "b5"])),
+            pytest.param(2, marks=_md(name="c2", depends=["b1", "b3", "b6"])),
+            pytest.param(3, marks=_md(name="c3", depends=["b1", "b2", "b4"]))
         ])
         def test_c(w):
             pass