Merge branch 'master' into doc

Author: RKrahl

CHANGES

@@ -3,6 +3,10 @@
 
 * Version 0.3 (not yet released)
 
+** New features
+
+ + Issue #7: Add a configuration switch to implicitly mark all tests.
+
 ** Incompatible changes
 
  + Prepend the class name to the default test name for test class
@@ -44,6 +48,8 @@
  + Issue #13: Do not import pytest in setup.py to make it compatible
    with pipenv.
 
+ + Issue #15: tests fail with pytest 3.3.0.
+
  + Clarify in the documentation that Python 3.1 is not officially
    supported because pytest 2.8 does not support it.  There is no
    known issue with Python 3.1 though.

doc/src/configuration.rst

@@ -14,3 +14,12 @@ Configuration file options can be set in the `ini file`.
       This is a builtin configuration option of pytest itself.  Since
       pytest-dependency requires pytest 2.8.0 or newer, it is
       recommended to set this option accordingly.
+
+   automark_dependency
+      This is a flag.  If set to `False`, the default, the outcome of
+      a test will only be registered if the test has been decorated
+      with the :func:`pytest.mark.dependency` marker.  As a results,
+      all tests, the dependencies and the dependent tests must be
+      decorated.  If set to `True`, the outcome of all tests will be
+      registered.  It has the same effect as if all tests are
+      implicitly decorated with :func:`pytest.mark.dependency`.

pytest_dependency.py

@@ -5,6 +5,22 @@
 
 import pytest
 
+_automark = False
+
+
+def _get_bool(value):
+    """Evaluate string representation of a boolean value.
+    """
+    if value:
+        if value.lower() in ["0", "no", "n", "false", "f", "off"]:
+            return False
+        elif value.lower() in ["1", "yes", "y", "true", "t", "on"]:
+            return True
+        else:
+            raise ValueError("Invalid truth value '%s'" % value)
+    else:
+        return False
+
 
 class DependencyItemStatus(object):
     """Status of a test item in a dependency manager.
@@ -45,8 +61,7 @@ def getManager(cls, item, scope='module'):
     def __init__(self):
         self.results = {}
 
-    def addResult(self, item, marker, rep):
-        name = marker.kwargs.get('name')
+    def addResult(self, item, name, rep):
         if not name:
             if item.cls:
                 name = "%s::%s" % (item.cls.__name__, item.name)
@@ -83,16 +98,28 @@ def depends(request, other):
     manager.checkDepend(other, item)
 
 
+def pytest_addoption(parser):
+    parser.addini("automark_dependency", 
+                  "Add the dependency marker to all tests automatically", 
+                  default=False)
+
+
+def pytest_configure(config):
+    global _automark
+    _automark = _get_bool(config.getini("automark_dependency"))
+
+
 @pytest.hookimpl(tryfirst=True, hookwrapper=True)
 def pytest_runtest_makereport(item, call):
     """Store the test outcome if this item is marked "dependency".
     """
     outcome = yield
     marker = item.get_marker("dependency")
-    if marker is not None:
+    if marker is not None or _automark:
         rep = outcome.get_result()
+        name = marker.kwargs.get('name') if marker is not None else None
         manager = DependencyManager.getManager(item)
-        manager.addResult(item, marker, rep)
+        manager.addResult(item, name, rep)
 
 
 def pytest_runtest_setup(item):

tests/conftest.py

@@ -5,6 +5,10 @@
 
 @pytest.fixture
 def ctestdir(testdir):
+    testdir.makefile('.ini', pytest="""
+        [pytest]
+        console_output_style = classic
+    """)
     testdir.makeconftest("""
         import sys
         if "pytest_dependency" not in sys.modules:

tests/test_04_automark.py

@@ -0,0 +1,89 @@
+"""Test the automark_dependency option.
+"""
+
+import pytest
+
+
+def test_not_set(ctestdir):
+    """No pytest.ini file, e.g. automark_dependency is not set.
+
+    Since automark_dependency defaults to false and test_a is not
+    marked, the outcome of test_a will not be recorded.  As a result,
+    test_b will be skipped due to a missing dependency.
+    """
+    ctestdir.makepyfile("""
+        import pytest
+
+        def test_a():
+            pass
+
+        @pytest.mark.dependency(depends=["test_a"])
+        def test_b():
+            pass
+    """)
+    result = ctestdir.runpytest("--verbose", "-rs")
+    result.assert_outcomes(passed=1, skipped=1, failed=0)
+    result.stdout.fnmatch_lines("""
+        *::test_a PASSED
+        *::test_b SKIPPED
+    """)
+
+
+def test_set_false(ctestdir):
+    """A pytest.ini is present, automark_dependency is set to false.
+
+    Since automark_dependency is set to false and test_a is not
+    marked, the outcome of test_a will not be recorded.  As a result,
+    test_b will be skipped due to a missing dependency.
+    """
+    ctestdir.makefile('.ini', pytest="""
+        [pytest]
+        automark_dependency = false
+        console_output_style = classic
+    """)
+    ctestdir.makepyfile("""
+        import pytest
+
+        def test_a():
+            pass
+
+        @pytest.mark.dependency(depends=["test_a"])
+        def test_b():
+            pass
+    """)
+    result = ctestdir.runpytest("--verbose", "-rs")
+    result.assert_outcomes(passed=1, skipped=1, failed=0)
+    result.stdout.fnmatch_lines("""
+        *::test_a PASSED
+        *::test_b SKIPPED
+    """)
+
+
+def test_set_true(ctestdir):
+    """A pytest.ini is present, automark_dependency is set to false.
+
+    Since automark_dependency is set to true, the outcome of test_a
+    will be recorded, even though it is not marked.  As a result,
+    test_b will be skipped due to a missing dependency.
+    """
+    ctestdir.makefile('.ini', pytest="""
+        [pytest]
+        automark_dependency = true
+        console_output_style = classic
+    """)
+    ctestdir.makepyfile("""
+        import pytest
+
+        def test_a():
+            pass
+
+        @pytest.mark.dependency(depends=["test_a"])
+        def test_b():
+            pass
+    """)
+    result = ctestdir.runpytest("--verbose", "-rs")
+    result.assert_outcomes(passed=2, skipped=0, failed=0)
+    result.stdout.fnmatch_lines("""
+        *::test_a PASSED
+        *::test_b PASSED
+    """)