commit 042146f5177dd1c2916b75ebaa6f99bacfca87cb
author brandjon <brandjon@google.com> Mon Feb 01 17:33:17 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Feb 01 17:34:40 2021 -0800
tree bace9165b19d71d7a5900de60879b2f406307c2a
parent f3c37db370aa4cba3a192d81bf8514a68206aef8

Improve diagnostic for PrepareDepsOfTargetsUnderDirectoryFunctionTest

We've been hitting a (flaky?) bug in CI that we haven't been able to reproduce locally yet. The failure is here, so this assertion change should help us see what the actual error message is.

PiperOrigin-RevId: 355062974

src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java
index 1cf347f..d83878e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.skyframe;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.skyframe.EvaluationResultSubjectFactory.assertThatEvaluationResult;
 import static com.google.devtools.build.skyframe.WalkableGraphUtils.exists;
 
 import com.google.common.base.Preconditions;
@@ -82,7 +83,7 @@
             .build();
     EvaluationResult<PrepareDepsOfTargetsUnderDirectoryValue> evaluationResult =
         skyframeExecutor.getDriver().evaluate(ImmutableList.copyOf(keys), evaluationContext);
-    Preconditions.checkState(!evaluationResult.hasError());
+    assertThatEvaluationResult(evaluationResult).hasNoError();
     return evaluationResult;
   }