Make pytester use pytest's capture implementation

pytest-dev · Feb 19, 2017 · 8091184 · 8091184
1 parent f6d5651
commit 8091184
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/_pytest/pytester.py b/_pytest/pytester.py
@@ -12,6 +12,7 @@
 
 from py.builtin import print_
 
+from _pytest.capture import MultiCapture, SysCapture
 from _pytest._code import Source
 import py
 import pytest
@@ -734,7 +735,8 @@ def runpytest_inprocess(self, *args, **kwargs):
         if kwargs.get("syspathinsert"):
             self.syspathinsert()
         now = time.time()
-        capture = py.io.StdCapture()
+        capture = MultiCapture(Capture=SysCapture)
+        capture.start_capturing()
         try:
             try:
                 reprec = self.inline_run(*args, **kwargs)
@@ -749,7 +751,8 @@ class reprec:
                 class reprec:
                     ret = 3
         finally:
-            out, err = capture.reset()
+            out, err = capture.readouterr()
+            capture.stop_capturing()
             sys.stdout.write(out)
             sys.stderr.write(err)