From 042146f5177dd1c2916b75ebaa6f99bacfca87cb Mon Sep 17 00:00:00 2001
From: brandjon <brandjon@google.com>
Date: Mon, 1 Feb 2021 17:33:17 -0800
Subject: [PATCH] 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
---
 .../PrepareDepsOfTargetsUnderDirectoryFunctionTest.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 1cf347f4db28cc..d83878e974dcc6 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 @@ private EvaluationResult<?> getEvaluationResult(SkyKey... keys) throws Interrupt
             .build();
     EvaluationResult<PrepareDepsOfTargetsUnderDirectoryValue> evaluationResult =
         skyframeExecutor.getDriver().evaluate(ImmutableList.copyOf(keys), evaluationContext);
-    Preconditions.checkState(!evaluationResult.hasError());
+    assertThatEvaluationResult(evaluationResult).hasNoError();
     return evaluationResult;
   }