Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2018-10-13 08:50:32 -03:00
parent 933de16fe4 eabf15b626
commit 29d5849519
20 changed files with 47 additions and 51 deletions
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@@ -130,7 +130,7 @@ def pytest_addoption(parser):
        "python_functions",
        type="args",
        default=["test"],
-        help="prefixes or glob names for Python test function and " "method discovery",
+        help="prefixes or glob names for Python test function and method discovery",
    )

    group.addoption(