commit fbc43bbe48ca37f4ec0db2b80f5400e71f9640b0
author mschaller <mschaller@google.com> Wed May 20 00:59:41 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 20 01:00:45 2020 -0700
tree f05e144f35ce643f48193b5faca7bd562563c06c
parent d9aa8aea0e248415e3a237f807aa909417dbe3c2

Phase out use of ExitCode without details in some tests

This makes it easier to restrict the use of methods that don't specify
details.

RELNOTES: None.
PiperOrigin-RevId: 312436723

src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java
index 7d483f5..c4d4ba5 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java
@@ -22,8 +22,10 @@
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.exec.BinTools;
 import com.google.devtools.build.lib.runtime.commands.VersionCommand;
+import com.google.devtools.build.lib.server.FailureDetails.Crash;
+import com.google.devtools.build.lib.server.FailureDetails.Crash.Code;
+import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
 import com.google.devtools.build.lib.util.DetailedExitCode;
-import com.google.devtools.build.lib.util.ExitCode;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 import com.google.devtools.common.options.OptionsBase;
@@ -135,9 +137,17 @@
             0L,
             0L);
     runtime.beforeCommand(env, options.getOptions(CommonCommandOptions.class));
-    runtime.cleanUpForCrash(DetailedExitCode.justExitCode(ExitCode.OOM_ERROR));
-    BlazeCommandResult mainThreadCrash = BlazeCommandResult.exitCode(ExitCode.BLAZE_INTERNAL_ERROR);
-    assertThat(runtime.afterCommand(env, mainThreadCrash).getExitCode())
-        .isEqualTo(ExitCode.OOM_ERROR);
+    DetailedExitCode oom =
+        DetailedExitCode.of(
+            FailureDetail.newBuilder()
+                .setCrash(Crash.newBuilder().setCode(Code.CRASH_OOM))
+                .build());
+    runtime.cleanUpForCrash(oom);
+    BlazeCommandResult mainThreadCrash =
+        BlazeCommandResult.failureDetail(
+            FailureDetail.newBuilder()
+                .setCrash(Crash.newBuilder().setCode(Code.CRASH_UNKNOWN))
+                .build());
+    assertThat(runtime.afterCommand(env, mainThreadCrash).getDetailedExitCode()).isEqualTo(oom);
   }
 }