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

2019-06-25 12:07:54 -03:00
parent 64a6365227 4d5780facf
commit 019455298b
9 changed files with 55 additions and 11 deletions
--- a/testing/test_capture.py
+++ b/testing/test_capture.py
@@ -735,7 +735,7 @@ def test_capture_badoutput_issue412(testdir):
            assert 0
        """
    )
-    result = testdir.runpytest("--cap=fd")
+    result = testdir.runpytest("--capture=fd")
    result.stdout.fnmatch_lines(
        """
        *def test_func*