diff options
| author | Bruno Oliveira <bruno@esss.com.br> | 2019-06-25 12:07:54 -0300 |
|---|---|---|
| committer | Bruno Oliveira <bruno@esss.com.br> | 2019-06-25 12:07:54 -0300 |
| commit | 019455298b77f3654641f456f52664786955b290 (patch) | |
| tree | 8d3cbf0ca79b49374a268fd5d75da21967b24f63 /testing/test_capture.py | |
| parent | 64a63652278d43b99aec5b5a3f36afd220b01f90 (diff) | |
| parent | 4d5780facf9f6082263994c263136887d4a166eb (diff) | |
| download | pytest-019455298b77f3654641f456f52664786955b290.tar.gz | |
Merge remote-tracking branch 'upstream/features' into merge-features-into-master
Diffstat (limited to 'testing/test_capture.py')
| -rw-r--r-- | testing/test_capture.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/test_capture.py b/testing/test_capture.py index 8d1d33bc7..f5b193597 100644 --- 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* |