Merge branch 'register-marker'

Author: RKrahl

CHANGES

@@ -1,6 +1,14 @@
                History of changes to pytest-dependency
                =======================================
 
+* Version 0.4 (not yet released)
+
+** Bug fixes and minor changes
+
+ + Issue #5: properly register the dependency marker.
+
+ + Do not add the documentation to the source distribution.
+
 * Version 0.3.1 (2017-12-26)
 
 ** Bug fixes and minor changes

pytest_dependency.py

@@ -117,6 +117,10 @@ def pytest_configure(config):
     global _automark, _ignore_unknown
     _automark = _get_bool(config.getini("automark_dependency"))
     _ignore_unknown = config.getoption("--ignore-unknown-dependency")
+    config.addinivalue_line("markers", 
+                            "dependency(name=None, depends=[]): "
+                            "mark a test to be used as a dependency for "
+                            "other tests or to depend on other tests.")
 
 
 @pytest.hookimpl(tryfirst=True, hookwrapper=True)

tests/test_01_marker.py

@@ -4,6 +4,13 @@
 import pytest
 
 
+def test_marker_registered(ctestdir):
+    result = ctestdir.runpytest("--markers")
+    result.stdout.fnmatch_lines("""
+        @pytest.mark.dependency*
+    """)
+
+
 def test_marker(ctestdir):
     ctestdir.makepyfile("""
         import pytest