Add capstdout and capstderr attrs to TestReport

Related to #1790

Author: nicoddemus

_pytest/junitxml.py

@@ -118,13 +118,10 @@ def _add_simple(self, kind, message, data=None):
 
     def _write_captured_output(self, report):
         for capname in ('out', 'err'):
-            allcontent = ""
-            for name, content in report.get_sections("Captured std%s" %
-                                                     capname):
-                allcontent += content
-            if allcontent:
+            content = getattr(report, 'capstd' + capname)
+            if content:
                 tag = getattr(Junit, 'system-' + capname)
-                self.append(tag(bin_xml_escape(allcontent)))
+                self.append(tag(bin_xml_escape(content)))
 
     def append_pass(self, report):
         self.add_stats('passed')

_pytest/runner.py

@@ -225,6 +225,22 @@ def longreprtext(self):
         exc = tw.stringio.getvalue()
         return exc.strip()
 
+    @property
+    def capstdout(self):
+        """Return captured text from stdout, if capturing is enabled
+
+        .. versionadded:: 3.0
+        """
+        return ''.join(content for (prefix, content) in self.get_sections('Captured stdout'))
+
+    @property
+    def capstderr(self):
+        """Return captured text from stderr, if capturing is enabled
+
+        .. versionadded:: 3.0
+        """
+        return ''.join(content for (prefix, content) in self.get_sections('Captured stderr'))
+
     passed = property(lambda x: x.outcome == "passed")
     failed = property(lambda x: x.outcome == "failed")
     skipped = property(lambda x: x.outcome == "skipped")

testing/test_runner.py

@@ -672,18 +672,21 @@ def runtest(self):
 
 class TestReportContents:
     """
-    Test ``longreprtext`` property of TestReport objects.
+    Test user-level API of ``TestReport`` objects.
     """
 
-    def test_pass(self, testdir):
+    def getrunner(self):
+        return lambda item: runner.runtestprotocol(item, log=False)
+
+    def test_longreprtext_pass(self, testdir):
         reports = testdir.runitem("""
             def test_func():
                 pass
         """)
         rep = reports[1]
         assert rep.longreprtext == ''
 
-    def test_failure(self, testdir):
+    def test_longreprtext_failure(self, testdir):
         reports = testdir.runitem("""
             def test_func():
                 x = 1
@@ -692,5 +695,41 @@ def test_func():
         rep = reports[1]
         assert 'assert 1 == 4' in rep.longreprtext
 
-    def getrunner(self):
-        return lambda item: runner.runtestprotocol(item, log=False)
+    def test_captured_text(self, testdir):
+        reports = testdir.runitem("""
+            import pytest
+            import sys
+
+            @pytest.fixture
+            def fix():
+                sys.stdout.write('setup: stdout\\n')
+                sys.stderr.write('setup: stderr\\n')
+                yield
+                sys.stdout.write('teardown: stdout\\n')
+                sys.stderr.write('teardown: stderr\\n')
+                assert 0
+
+            def test_func(fix):
+                sys.stdout.write('call: stdout\\n')
+                sys.stderr.write('call: stderr\\n')
+                assert 0
+        """)
+        setup, call, teardown = reports
+        assert setup.capstdout == 'setup: stdout\n'
+        assert call.capstdout == 'setup: stdout\ncall: stdout\n'
+        assert teardown.capstdout == 'setup: stdout\ncall: stdout\nteardown: stdout\n'
+
+        assert setup.capstderr == 'setup: stderr\n'
+        assert call.capstderr == 'setup: stderr\ncall: stderr\n'
+        assert teardown.capstderr == 'setup: stderr\ncall: stderr\nteardown: stderr\n'
+
+    def test_no_captured_text(self, testdir):
+        reports = testdir.runitem("""
+            def test_func():
+                pass
+        """)
+        rep = reports[1]
+        assert rep.capstdout == ''
+        assert rep.capstderr == ''
+
+