internally switch to pytest.plugin.NAME instead of pytest.plugin.pytest_NAME

--HG--
branch : trunk

testing/plugin/test_mark.py

@@ -0,0 +1,175 @@
+import py
+from pytest.plugin.mark import MarkGenerator as Mark
+
+class TestMark:
+    def test_pytest_mark_notcallable(self):
+        mark = Mark()
+        py.test.raises((AttributeError, TypeError), "mark()")
+
+    def test_pytest_mark_bare(self):
+        mark = Mark()
+        def f(): pass
+        mark.hello(f)
+        assert f.hello
+
+    def test_pytest_mark_keywords(self):
+        mark = Mark()
+        def f(): pass
+        mark.world(x=3, y=4)(f)
+        assert f.world
+        assert f.world.x == 3
+        assert f.world.y == 4
+
+    def test_apply_multiple_and_merge(self):
+        mark = Mark()
+        def f(): pass
+        marker = mark.world
+        mark.world(x=3)(f)
+        assert f.world.x == 3
+        mark.world(y=4)(f)
+        assert f.world.x == 3
+        assert f.world.y == 4
+        mark.world(y=1)(f)
+        assert f.world.y == 1
+        assert len(f.world.args) == 0
+
+    def test_pytest_mark_positional(self):
+        mark = Mark()
+        def f(): pass
+        mark.world("hello")(f)
+        assert f.world.args[0] == "hello"
+        mark.world("world")(f)
+
+    def test_oldstyle_marker_access(self, recwarn):
+        mark = Mark()
+        def f(): pass
+        mark.world(x=1)(f)
+        assert f.world.x == 1
+        assert recwarn.pop()
+
+class TestFunctional:
+    def test_mark_per_function(self, testdir):
+        p = testdir.makepyfile("""
+            import py
+            @py.test.mark.hello
+            def test_hello():
+                assert hasattr(test_hello, 'hello')
+        """)
+        result = testdir.runpytest(p)
+        result.stdout.fnmatch_lines(["*passed*"])
+
+    def test_mark_per_module(self, testdir):
+        item = testdir.getitem("""
+            import py
+            pytestmark = py.test.mark.hello
+            def test_func():
+                pass
+        """)
+        keywords = item.keywords
+        assert 'hello' in keywords
+
+    def test_marklist_per_class(self, testdir):
+        modcol = testdir.getmodulecol("""
+            import py
+            class TestClass:
+                pytestmark = [py.test.mark.hello, py.test.mark.world]
+                def test_func(self):
+                    assert TestClass.test_func.hello
+                    assert TestClass.test_func.world
+        """)
+        clscol = modcol.collect()[0]
+        item = clscol.collect()[0].collect()[0]
+        keywords = item.keywords
+        assert 'hello' in keywords
+
+    def test_marklist_per_module(self, testdir):
+        modcol = testdir.getmodulecol("""
+            import py
+            pytestmark = [py.test.mark.hello, py.test.mark.world]
+            class TestClass:
+                def test_func(self):
+                    assert TestClass.test_func.hello
+                    assert TestClass.test_func.world
+        """)
+        clscol = modcol.collect()[0]
+        item = clscol.collect()[0].collect()[0]
+        keywords = item.keywords
+        assert 'hello' in keywords
+        assert 'world' in keywords
+
+    @py.test.mark.skipif("sys.version_info < (2,6)")
+    def test_mark_per_class_decorator(self, testdir):
+        modcol = testdir.getmodulecol("""
+            import py
+            @py.test.mark.hello
+            class TestClass:
+                def test_func(self):
+                    assert TestClass.test_func.hello
+        """)
+        clscol = modcol.collect()[0]
+        item = clscol.collect()[0].collect()[0]
+        keywords = item.keywords
+        assert 'hello' in keywords
+
+    @py.test.mark.skipif("sys.version_info < (2,6)")
+    def test_mark_per_class_decorator_plus_existing_dec(self, testdir):
+        modcol = testdir.getmodulecol("""
+            import py
+            @py.test.mark.hello
+            class TestClass:
+                pytestmark = py.test.mark.world
+                def test_func(self):
+                    assert TestClass.test_func.hello
+                    assert TestClass.test_func.world
+        """)
+        clscol = modcol.collect()[0]
+        item = clscol.collect()[0].collect()[0]
+        keywords = item.keywords
+        assert 'hello' in keywords
+        assert 'world' in keywords
+
+    def test_merging_markers(self, testdir):
+        p = testdir.makepyfile("""
+            import py
+            pytestmark = py.test.mark.hello("pos1", x=1, y=2)
+            class TestClass:
+                # classlevel overrides module level
+                pytestmark = py.test.mark.hello(x=3)
+                @py.test.mark.hello("pos0", z=4)
+                def test_func(self):
+                    pass
+        """)
+        items, rec = testdir.inline_genitems(p)
+        item, = items
+        keywords = item.keywords
+        marker = keywords['hello']
+        assert marker.args == ["pos0", "pos1"]
+        assert marker.kwargs == {'x': 3, 'y': 2, 'z': 4}
+
+    def test_mark_other(self, testdir):
+        item = testdir.getitem("""
+            import py
+            class pytestmark:
+                pass
+            def test_func():
+                pass
+        """)
+        keywords = item.keywords
+
+    def test_mark_dynamically_in_funcarg(self, testdir):
+        testdir.makeconftest("""
+            import py
+            def pytest_funcarg__arg(request):
+                request.applymarker(py.test.mark.hello)
+            def pytest_terminal_summary(terminalreporter):
+                l = terminalreporter.stats['passed']
+                terminalreporter._tw.line("keyword: %s" % l[0].keywords)
+        """)
+        testdir.makepyfile("""
+            def test_func(arg):
+                pass
+        """)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines([
+            "keyword: *hello*"
+        ])