Merge branch 'develop' into doc

Author: RKrahl

doc/src/scope.rst

@@ -16,8 +16,8 @@ or `'class'`.
     versions, all dependencies were implicitly in module scope.
 
 
-Explicitely specifying the scope
---------------------------------
+Explicitly specifying the scope
+-------------------------------
 
 The default value for the `scope` argument is `'module'`.  Thus, the
 very first example from Section :ref:`usage-basic` could also be

doc/src/usage.rst

@@ -50,7 +50,7 @@ see Section :ref:`names` for details.  In some cases, it's not easy to
 predict the names of the node ids.  For this reason, the name of the
 tests can be overridden by an explicit `name` argument to the marker.
 The names must be unique.  The following example works exactly as the
-last one, only the test names are explicitely set:
+last one, only the test names are explicitly set:
 
 .. literalinclude:: ../examples/named.py
 
@@ -110,7 +110,7 @@ Marking dependencies at runtime
 -------------------------------
 
 Sometimes, dependencies of test instances are too complicated to be
-formulated explicitely beforehand using the
+formulated explicitly beforehand using the
 :func:`pytest.mark.dependency` marker.  It may be easier to compile
 the list of dependencies of a test at run time.  In such cases, the
 function :func:`pytest_dependency.depends` comes handy.  Consider the

tests/test_03_class.py

@@ -47,7 +47,7 @@ def test_e(self):
 
 def test_class_simple_named(ctestdir):
     """Mostly the same as test_class_simple(), but name the test methods
-    now explicitely.
+    now explicitly.
     """
     ctestdir.makepyfile("""
         import pytest

tests/test_03_param.py

@@ -4,6 +4,38 @@
 import pytest
 
 
+def test_simple_params(ctestdir):
+    """Simple test for a dependency on a parametrized test.
+
+    This example has been used in the discussion of PR #43.
+    """
+    ctestdir.makepyfile("""
+        import pytest
+
+        _md = pytest.mark.dependency
+
+        @pytest.mark.parametrize("x", [ 0, 1 ])
+        @pytest.mark.dependency()
+        def test_a(x):
+            assert x == 0
+
+        @pytest.mark.parametrize("x", [
+            pytest.param(0, marks=_md(depends=["test_a[0]"])),
+            pytest.param(1, marks=_md(depends=["test_a[1]"])),
+        ])
+        def test_b(x):
+            pass
+    """)
+    result = ctestdir.runpytest("--verbose")
+    result.assert_outcomes(passed=2, skipped=1, failed=1)
+    result.stdout.re_match_lines(r"""
+        .*::test_a\[0\] PASSED
+        .*::test_a\[1\] FAILED
+        .*::test_b\[0\] PASSED
+        .*::test_b\[1\] SKIPPED(?:\s+\(.*\))?
+    """)
+
+
 def test_multiple(ctestdir):
     ctestdir.makepyfile("""
         import pytest

tests/test_03_scope.py

@@ -5,7 +5,7 @@
 
 
 def test_scope_module(ctestdir):
-    """One single module, module scope is explicitely set in the
+    """One single module, module scope is explicitly set in the
     pytest.mark.dependency() marker.
     """
     ctestdir.makepyfile("""
@@ -379,7 +379,7 @@ def test_o(self):
     """)
 
 def test_scope_named(ctestdir):
-    """Explicitely named tests are always referenced by that name,
+    """Explicitly named tests are always referenced by that name,
     regardless of the scope.
     """
     ctestdir.makepyfile("""

tests/test_09_examples_scope.py

@@ -7,7 +7,7 @@
 
 
 def test_scope_module(ctestdir):
-    """Explicitely specifying the scope
+    """Explicitly specifying the scope
     """
     with get_example("scope_module.py").open("rt") as f:
         ctestdir.makepyfile(f.read())