fix: show error log when command fails (#965)

internal ref: b/309442390
GoogleCloudPlatform · Nov 19, 2023 · be7f7c8 · be7f7c8
1 parent f3a77a5
commit be7f7c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...re/src/main/java/com/google/cloud/tools/managedcloudsdk/command/CommandExitException.java b/...re/src/main/java/com/google/cloud/tools/managedcloudsdk/command/CommandExitException.java
@@ -30,7 +30,7 @@ public class CommandExitException extends Exception {
    * @param errorLog additional loggable error information
    */
   public CommandExitException(int exitCode, @Nullable String errorLog) {
-    super("Process failed with exit code: " + exitCode);
+    super("Process failed with exit code: " + exitCode + (errorLog != null ? "\n" + errorLog : ""));
     this.exitCode = exitCode;
     this.errorLog = errorLog;
   }

diff --git a/...-core/src/test/java/com/google/cloud/tools/managedcloudsdk/command/CommandCallerTest.java b/...-core/src/test/java/com/google/cloud/tools/managedcloudsdk/command/CommandCallerTest.java
@@ -110,7 +110,7 @@ public void testCall_nonZeroExit()
       testCommandCaller.call(fakeCommand, fakeWorkingDirectory, fakeEnvironment);
       Assert.fail("CommandExitException expected but not found.");
     } catch (CommandExitException ex) {
-      Assert.assertEquals("Process failed with exit code: 10", ex.getMessage());
+      Assert.assertEquals("Process failed with exit code: 10\nstdout\nstderr", ex.getMessage());
       Assert.assertEquals(10, ex.getExitCode());
       Assert.assertEquals("stdout\nstderr", ex.getErrorLog());
     }