Add c++ test output to its own report section

Author: dajose

pytest_cpp/boost.py

@@ -51,7 +51,8 @@ def read_file(name):
         ]
         args.extend(test_args)
         p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        stdout, _ = p.communicate()
+        raw_stdout, _ = p.communicate()
+        stdout = raw_stdout.decode("utf-8") if raw_stdout else ""
 
         log = read_file(log_xml)
         report = read_file(report_xml)
@@ -76,20 +77,23 @@ def read_file(name):
                     returncode=p.returncode,
                 ),
             )
-            return [failure]
+            return [failure], stdout
 
         if report is not None and (
             report.startswith("Boost.Test framework internal error: ")
             or report.startswith("Test setup error: ")
         ):
             # boost.test doesn't do XML output on fatal-enough errors.
             failure = BoostTestFailure("unknown location", 0, report)
-            return [failure]
+            return [failure], stdout
 
         results = self._parse_log(log=log)
         shutil.rmtree(temp_dir)
+
         if results:
-            return results
+            return results, stdout
+
+        return None, stdout
 
     def _parse_log(self, log):
         """

pytest_cpp/google.py

@@ -59,18 +59,21 @@ def strip_comment(x):
 
     def run_test(self, executable, test_id, test_args=(), harness=None):
         harness = harness or []
+        output = ""
         xml_filename = self._get_temp_xml_filename()
         args = harness + [
             executable,
             "--gtest_filter=" + test_id,
             "--gtest_output=xml:%s" % xml_filename,
         ]
         args.extend(test_args)
+
         try:
-            subprocess.check_output(
+            output = subprocess.check_output(
                 args, stderr=subprocess.STDOUT, universal_newlines=True
             )
         except subprocess.CalledProcessError as e:
+            output = e.output
             if e.returncode != 1:
                 msg = (
                     "Internal Error: calling {executable} "
@@ -85,23 +88,24 @@ def run_test(self, executable, test_id, test_args=(), harness=None):
                         returncode=e.returncode,
                     )
                 )
-                return [failure]
+
+                return [failure], output
 
         results = self._parse_xml(xml_filename)
         os.remove(xml_filename)
         for (executed_test_id, failures, skipped) in results:
             if executed_test_id == test_id:
                 if failures:
-                    return [GoogleTestFailure(x) for x in failures]
+                    return [GoogleTestFailure(x) for x in failures], output
                 elif skipped:
                     pytest.skip()
                 else:
-                    return None
+                    return None, output
 
         msg = "Internal Error: could not find test " "{test_id} in results:\n{results}"
         results_list = "\n".join(x for (x, f) in results)
         failure = GoogleTestFailure(msg.format(test_id=test_id, results=results_list))
-        return [failure]
+        return [failure], output
 
     def _get_temp_xml_filename(self):
         return tempfile.mktemp()

pytest_cpp/plugin.py

@@ -126,12 +126,15 @@ def from_parent(cls, parent, name, facade, arguments):
         )
 
     def runtest(self):
-        failures = self.facade.run_test(
+        failures, output = self.facade.run_test(
             str(self.fspath),
             self.name,
             self._arguments,
             harness=self.config.getini("cpp_harness"),
         )
+        # Report the c++ output in its own sections
+        self.add_report_section("call", "c++", output)
+
         if failures:
             raise CppFailureError(failures)
 

tests/.gitignore

@@ -0,0 +1,10 @@
+*
+
+!.gitignore
+!*.h
+!*.cpp
+!*.cc
+!*.py
+!*.xml
+!README*
+!SCons*

tests/boost_failure.cpp

@@ -5,6 +5,7 @@
 
 BOOST_AUTO_TEST_CASE( test_failure_1 )
 {
+    printf("Just saying hi from boost\n");
     BOOST_CHECK( 2 * 3 == 5 );
 }
 

tests/gtest.cpp

@@ -14,6 +14,7 @@ TEST_F(FooTest, test_success) {
 
 // Tests that the Foo::Bar() method does Abc.
 TEST_F(FooTest, test_failure) {
+  printf("Just saying hi from gtest\n");
   EXPECT_EQ(2 * 3, 5);
   EXPECT_EQ(2 * 6, 15);
 }

tests/test_pytest_cpp.py

@@ -78,32 +78,32 @@ def test_is_test_suite(facade, name, other_name, exes, tmpdir):
     ],
 )
 def test_success(facade, name, test_id, exes):
-    assert facade.run_test(exes.get(name), test_id) is None
+    assert facade.run_test(exes.get(name), test_id)[0] is None
 
 
 def test_google_failure(exes):
     facade = GoogleTestFacade()
-    failures = facade.run_test(exes.get("gtest"), "FooTest.test_failure")
+    failures, _ = facade.run_test(exes.get("gtest"), "FooTest.test_failure")
     assert len(failures) == 2
     colors = ("red", "bold")
     assert failures[0].get_lines() == [
         ("      Expected: 2 * 3", colors),
         ("      Which is: 6", colors),
         ("To be equal to: 5", colors),
     ]
-    assert failures[0].get_file_reference() == ("gtest.cpp", 17)
+    assert failures[0].get_file_reference() == ("gtest.cpp", 19)
 
     assert failures[1].get_lines() == [
         ("      Expected: 2 * 6", colors),
         ("      Which is: 12", colors),
         ("To be equal to: 15", colors),
     ]
-    assert failures[1].get_file_reference() == ("gtest.cpp", 18)
+    assert failures[1].get_file_reference() == ("gtest.cpp", 20)
 
 
 def test_google_error(exes):
     facade = GoogleTestFacade()
-    failures = facade.run_test(exes.get("gtest"), "FooTest.test_error")
+    failures, _ = facade.run_test(exes.get("gtest"), "FooTest.test_error")
     assert len(failures) == 1
     colors = ("red", "bold")
     assert failures[0].get_lines() == [
@@ -124,21 +124,21 @@ def test_google_disabled(exes):
 
 def test_boost_failure(exes):
     facade = BoostTestFacade()
-    failures = facade.run_test(exes.get("boost_failure"), "<unused>")
+    failures, _ = facade.run_test(exes.get("boost_failure"), "<unused>")
     assert len(failures) == 2
 
     fail1, fail2 = failures
     colors = ("red", "bold")
     assert fail1.get_lines() == [("check 2 * 3 == 5 failed", colors)]
-    assert fail1.get_file_reference() == ("boost_failure.cpp", 8)
+    assert fail1.get_file_reference() == ("boost_failure.cpp", 9)
 
     assert fail2.get_lines() == [("check 2 - 1 == 0 failed", colors)]
-    assert fail2.get_file_reference() == ("boost_failure.cpp", 14)
+    assert fail2.get_file_reference() == ("boost_failure.cpp", 15)
 
 
 def test_boost_fatal_error(exes):
     facade = BoostTestFacade()
-    failures = facade.run_test(exes.get("boost_fatal_error"), "<unused>")
+    failures, _ = facade.run_test(exes.get("boost_fatal_error"), "<unused>")
     assert len(failures) == 1
 
     (fail1,) = failures
@@ -149,7 +149,7 @@ def test_boost_fatal_error(exes):
 
 def test_boost_error(exes):
     facade = BoostTestFacade()
-    failures = facade.run_test(exes.get("boost_error"), "<unused>")
+    failures, _ = facade.run_test(exes.get("boost_error"), "<unused>")
     assert len(failures) == 2
 
     fail1, fail2 = failures
@@ -165,7 +165,7 @@ def test_boost_error(exes):
 
 def test_boost_fixture_setup_error(exes):
     facade = BoostTestFacade()
-    failures = facade.run_test(exes.get("boost_fixture_setup_error"), "<unused>")
+    failures, _ = facade.run_test(exes.get("boost_fixture_setup_error"), "<unused>")
     assert len(failures) == 1
 
     fail1 = failures[0]
@@ -501,6 +501,26 @@ def test_exe_mask_on_windows(tmpdir, monkeypatch):
     assert not pytest_cpp.plugin.matches_any_mask(fn, ["test_*", "*_test"])
 
 
+def test_output_section(testdir, exes):
+    exes.get("boost_failure")
+    exes.get("gtest")
+
+    testdir.makeini(
+        """
+        [pytest]
+        cpp_files = gtest* boost*
+    """
+    )
+    result = testdir.runpytest("-k", "failure")
+    result.stdout.fnmatch_lines(
+        [
+            "*Captured c++ call*",
+            "Just saying hi from boost",
+            "Just saying hi from gtest",
+        ]
+    )
+
+
 class TestError:
     def test_get_whitespace(self):
         assert error.get_left_whitespace("  foo") == "  "