Merge master into features

Conflicts: src/_pytest/debugging.py
2019-11-06 14:22:07 +01:00
parent 92b436c938 5f9db8a017
commit 4e45472405
18 changed files with 79 additions and 36 deletions
--- a/testing/test_stepwise.py
+++ b/testing/test_stepwise.py
@@ -4,7 +4,7 @@ import pytest
@pytest.fixture
 def stepwise_testdir(testdir):
    # Rather than having to modify our testfile between tests, we introduce
-    # a flag for wether or not the second test should fail.
+    # a flag for whether or not the second test should fail.
    testdir.makeconftest(
        """
 def pytest_addoption(parser):