Prepend the class name to the default test name for test class methods.

Author: RKrahl

doc/examples/testclass.py

@@ -12,15 +12,15 @@ def test_a(self):
     def test_b(self):
         pass
 
-    @pytest.mark.dependency(depends=["test_a"])
+    @pytest.mark.dependency(depends=["TestClass::test_a"])
     def test_c(self):
         pass
 
-    @pytest.mark.dependency(depends=["test_b"])
+    @pytest.mark.dependency(depends=["TestClass::test_b"])
     def test_d(self):
         pass
 
-    @pytest.mark.dependency(depends=["test_b", "test_c"])
+    @pytest.mark.dependency(depends=["TestClass::test_b", "TestClass::test_c"])
     def test_e(self):
         pass
 

doc/src/usage.rst

@@ -59,10 +59,10 @@ works in the same manner as the previous examples respectively:
 
 .. literalinclude:: ../examples/testclass.py
 
-In `TestClass` the default names for the tests are used, which is the
-name of the respective method in this case, while in `TestClassNamed`
-these names are overridden an explicit name argument to the
-:func:`pytest.mark.dependency` marker.
+In `TestClass` the default names for the tests are used, which is
+build from the name of the class and the respective method in this
+case, while in `TestClassNamed` these names are overridden by an
+explicit name argument to the :func:`pytest.mark.dependency` marker.
 
 Parametrized tests
 ------------------

pytest_dependency.py

@@ -52,7 +52,10 @@ def __init__(self):
     def addResult(self, item, marker, rep):
         name = marker.kwargs.get('name')
         if not name:
-            name = item.name
+            if item.cls:
+                name = "%s::%s" % (item.cls.__name__, item.name)
+            else:
+                name = item.name
         status = self.results.setdefault(name, DependencyItemStatus())
         status.addResult(rep)
 

tests/test_03_class.py

@@ -21,15 +21,16 @@ def test_a(self):
             def test_b(self):
                 pass
 
-            @pytest.mark.dependency(depends=["test_a"])
+            @pytest.mark.dependency(depends=["TestClass::test_a"])
             def test_c(self):
                 pass
 
-            @pytest.mark.dependency(depends=["test_b"])
+            @pytest.mark.dependency(depends=["TestClass::test_b"])
             def test_d(self):
                 pass
 
-            @pytest.mark.dependency(depends=["test_b", "test_c"])
+            @pytest.mark.dependency(depends=["TestClass::test_b", 
+                                             "TestClass::test_c"])
             def test_e(self):
                 pass
     """)
@@ -84,12 +85,15 @@ def test_e(self):
     """)
 
 
-@pytest.mark.xfail(reason="Issue #6")
 def test_class_default_name(ctestdir):
-    """For methods of test classes, the default name is the method name.
-    This may cause conflicts if there is a function having the same
-    name outside the class.  Note how the method test_a() of class
-    TestClass shadows the failure of function test_a().
+    """Issue #6: for methods of test classes, the default name used to be
+    the method name.  This could have caused conflicts if there is a
+    function having the same name outside the class.  In the following
+    example, before fixing this issue, the method test_a() of class
+    TestClass would have shadowed the failure of function test_a().
+
+    Now the class name is prepended to the default test name, removing
+    this conflict.
     """
     ctestdir.makepyfile("""
         import pytest