commit 1d4f011b206d7244c2801b350bc1cc6b460f3523
author janakr <janakr@google.com> Wed Feb 21 12:10:10 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Wed Feb 21 12:12:16 2018 -0800
tree 1b53085751fc243d694c3eaf1ddf3cea4089b80e
parent ab37330bb7e549a24031418b1885048f75c111ce

Deflake ParallelEvaluatorTest.errorBubblesToParentsOfTopLevelValue: error cannot finish building until top registers a dep on it, and we can only know that by listening to the addReverseDep call.

PiperOrigin-RevId: 186499232

src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java

diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
index 558c5ed..d0d7b97 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
@@ -773,14 +773,23 @@
 
   @Test
   public void errorBubblesToParentsOfTopLevelValue() throws Exception {
-    graph = new InMemoryGraphImpl();
     SkyKey parentKey = GraphTester.toSkyKey("parent");
-    final SkyKey errorKey = GraphTester.toSkyKey("error");
-    final CountDownLatch latch = new CountDownLatch(1);
+    SkyKey errorKey = GraphTester.toSkyKey("error");
+    CountDownLatch latch = new CountDownLatch(1);
+    graph =
+        new NotifyingHelper.NotifyingProcessableGraph(
+            new InMemoryGraphImpl(),
+            (key, type, order, context) -> {
+              if (key.equals(errorKey)
+                  && parentKey.equals(context)
+                  && type == EventType.ADD_REVERSE_DEP
+                  && order == Order.AFTER) {
+                latch.countDown();
+              }
+            });
     tester.getOrCreate(errorKey).setBuilder(new ChainedFunction(null, /*waitToFinish=*/latch, null,
         false, /*value=*/null, ImmutableList.<SkyKey>of()));
-    tester.getOrCreate(parentKey).setBuilder(new ChainedFunction(/*notifyStart=*/latch, null, null,
-        false, new StringValue("unused"), ImmutableList.of(errorKey)));
+    tester.getOrCreate(parentKey).addDependency(errorKey).setComputedValue(CONCATENATE);
     EvaluationResult<StringValue> result = eval( /*keepGoing=*/false,
         ImmutableList.of(parentKey, errorKey));
     assertWithMessage(result.toString()).that(result.errorMap().size()).isEqualTo(2);