Catch2: fix multiple section failures (#112)

Author: jnewb1

CHANGELOG.md

@@ -1,3 +1,7 @@
+# UNRELEASED
+
+- Catch2: fix issue with multiple test failures, and support multiple "SECTION" tests. ([#112](https://github.com/pytest-dev/pytest-cpp/pull/112))
+
 # 2.3.0 (2023-01-30)
 
 - New `cpp_harness_collect` configuration option allows users to add prefix arguments to run C++ test executables, allowing to use additional tools like `wine` of `qemu` for a test runners in cross-platform development.

src/pytest_cpp/catch2.py

@@ -96,24 +96,6 @@ def run_test(
                 )
             except subprocess.CalledProcessError as e:
                 output = e.output
-                if e.returncode != 1:
-                    msg = (
-                        "Internal Error: calling {executable} "
-                        "for test {test_id} failed (returncode={returncode}):\n"
-                        "{output}"
-                    )
-                    failure = Catch2Failure(
-                        executable,
-                        0,
-                        msg.format(
-                            executable=executable,
-                            test_id=test_id,
-                            output=e.output,
-                            returncode=e.returncode,
-                        ),
-                    )
-
-                    return [failure], output
 
             results = self._parse_xml(xml_filename)
 
@@ -151,7 +133,7 @@ def _parse_xml(
                 test_result = test_case.find("OverallResult")
                 failures = []
                 if test_result is not None and test_result.attrib["success"] == "false":
-                    test_checks = test_case.findall("Expression")
+                    test_checks = test_case.findall(".//Expression")
                     for check in test_checks:
                         file_name = check.attrib["filename"]
                         line_num = int(check.attrib["line"])

tests/catch2_failure.cpp

@@ -12,3 +12,13 @@ TEST_CASE( "Factorials are computed", "[factorial]" ) {
     REQUIRE( Factorial(3) == 6 );
     REQUIRE( Factorial(10) == 3628800 );
 }
+
+TEST_CASE( "Failed Sections" ) {
+    SECTION( "failed 1" ) {
+        REQUIRE(false);
+    }
+
+    SECTION( "failed 2" ) {
+        REQUIRE(false);
+    }
+}

tests/catch2_success.cpp

@@ -11,3 +11,13 @@ TEST_CASE( "Factorials are computed", "[factorial]" ) {
     REQUIRE( Factorial(3) == 6 );
     REQUIRE( Factorial(10) == 3628800 );
 }
+
+TEST_CASE( "Passed Sections" ) {
+    SECTION( "passed 1" ) {
+        REQUIRE(true);
+    }
+
+    SECTION( "passed 2" ) {
+        REQUIRE(true);
+    }
+}

tests/test_pytest_cpp.py

@@ -57,7 +57,11 @@ def get_file_reference(self):
         (BoostTestFacade(), "boost_success", ["boost_success"]),
         (BoostTestFacade(), "boost_error", ["boost_error"]),
         (BoostTestFacade(), "boost_fixture_setup_error", ["boost_fixture_setup_error"]),
-        (Catch2Facade(), "catch2_success", ["Factorials are computed"]),
+        (
+            Catch2Facade(),
+            "catch2_success",
+            ["Factorials are computed", "Passed Sections"],
+        ),
     ],
 )
 def test_list_tests(facade, name, expected, exes):
@@ -610,6 +614,9 @@ def test_catch2_failure(exes):
 
     assert fail1.get_file_reference() == ("catch2_failure.cpp", 9)
 
+    failures, _ = facade.run_test(exes.get("catch2_failure"), "Failed Sections")
+    assert len(failures) == 2
+
 
 class TestError:
     def test_get_whitespace(self):