Run 'colcon test-result' to print test failures (#794)

Signed-off-by: Christophe Bedard <[email protected]>
ros-tooling · Feb 16, 2023 · 79e12af · 79e12af
1 parent e9721b4
commit 79e12af
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -11337,7 +11337,6 @@ function runTests(colconCommandPrefix, options, testPackageSelection, colconExtr
             `colcon`,
             `test`,
             `--event-handlers=console_cohesion+`,
-            `--return-code-on-test-failure`,
             ...testPackageSelection,
             ...colconExtraArgs,
         ];
@@ -11346,6 +11345,15 @@ function runTests(colconCommandPrefix, options, testPackageSelection, colconExtr
         }
         if (doTests) {
             yield execShellCommand([...colconCommandPrefix, ...colconTestCmd], options, false);
+            /**
+             * Display all test results first and ignore the return code. Then, display only failing
+             * tests with their output and let non-zero return code fail the job.
+             */
+            const colconTestResultCmd = ["colcon", "test-result"];
+            const colconTestResultAllCmd = [...colconTestResultCmd, "--all"];
+            const colconTestResultVerboseCmd = [...colconTestResultCmd, "--verbose"];
+            yield execShellCommand([...colconCommandPrefix, ...colconTestResultAllCmd], Object.assign(Object.assign({}, options), { ignoreReturnCode: true }), false);
+            yield execShellCommand([...colconCommandPrefix, ...colconTestResultVerboseCmd], options, false);
         }
         if (doLcovResult) {
             // ignoreReturnCode, check comment above in --initial

diff --git a/src/action-ros-ci.ts b/src/action-ros-ci.ts
@@ -239,7 +239,6 @@ async function runTests(
 		`colcon`,
 		`test`,
 		`--event-handlers=console_cohesion+`,
-		`--return-code-on-test-failure`,
 		...testPackageSelection,
 		...colconExtraArgs,
 	];
@@ -253,6 +252,27 @@ async function runTests(
 			options,
 			false
 		);
+
+		/**
+		 * Display all test results first and ignore the return code. Then, display only failing
+		 * tests with their output and let non-zero return code fail the job.
+		 */
+		const colconTestResultCmd = ["colcon", "test-result"];
+		const colconTestResultAllCmd = [...colconTestResultCmd, "--all"];
+		const colconTestResultVerboseCmd = [...colconTestResultCmd, "--verbose"];
+		await execShellCommand(
+			[...colconCommandPrefix, ...colconTestResultAllCmd],
+			{
+				...options,
+				ignoreReturnCode: true,
+			},
+			false
+		);
+		await execShellCommand(
+			[...colconCommandPrefix, ...colconTestResultVerboseCmd],
+			options,
+			false
+		);
 	}
 
 	if (doLcovResult) {