Merge pull request #3893 from jirikuncar/3892-macos

travis: run tests on macOS
2018-08-28 17:06:17 -03:00
parent 2a059b1c1b 32575f92c9
commit b77e533693
4 changed files with 19 additions and 1 deletions
--- a/src/_pytest/doctest.py
+++ b/src/_pytest/doctest.py
@@ -203,7 +203,8 @@ class DoctestItem(pytest.Item):
            return
        capman = self.config.pluginmanager.getplugin("capturemanager")
        if capman:
-            out, err = capman.suspend_global_capture(in_=True)
+            capman.suspend_global_capture(in_=True)
+            out, err = capman.read_global_capture()
            sys.stdout.write(out)
            sys.stderr.write(err)