Merge pull request #4129 from nicoddemus/merge-master-into-features

Merge master into features (prepare for 3.9)
2018-10-13 12:05:54 -03:00
parent ed42ada373 29d5849519
commit 24c83d725a
20 changed files with 47 additions and 51 deletions
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@@ -99,7 +99,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(