Delay cleaning of in-flight nodes until the following build. This allows us to interrupt evaluation in constant time.

Some ParallelEvaluator tests that implicitly relied on cleaning happening before the next evaluation were moved into MemoizingEvaluatorTest as a result.

--
MOS_MIGRATED_REVID=102696653

1 files changed, 3 insertions, 17 deletions

diff --git a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java
index 6d8d1d3b0f..1976766719 100644
--- a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java
@@ -308,10 +308,11 @@ public class InMemoryNodeEntryTest {
     assertEquals(DependencyState.NEEDS_SCHEDULING, entry.addReverseDepAndCheckIfDone(parent));
     try {
       entry.addReverseDepAndCheckIfDone(parent);
-      entry.getReverseDeps();
+      assertThat(setValue(entry, new SkyValue() {}, /*errorInfo=*/null, /*graphVersion=*/0L))
+          .containsExactly(parent);
       fail("Cannot add same dep twice");
     } catch (IllegalStateException e) {
-      // Expected.
+      assertThat(e.getMessage()).contains("Duplicate reverse deps");
     }
   }
 
@@ -349,21 +350,6 @@ public class InMemoryNodeEntryTest {
   }
 
   @Test
-  public void crashOnAddDirtyReverseDep() {
-    NodeEntry entry = new InMemoryNodeEntry();
-    SkyKey parent = key("parent");
-    assertEquals(DependencyState.NEEDS_SCHEDULING, entry.addReverseDepAndCheckIfDone(parent));
-    try {
-      entry.addReverseDepAndCheckIfDone(parent);
-      // We only check for duplicates when we request all the reverse deps.
-      entry.getReverseDeps();
-      fail("Cannot add same dep twice in one build, even if dirty");
-    } catch (IllegalStateException e) {
-      // Expected.
-    }
-  }
-
-  @Test
   public void pruneBeforeBuild() {
     NodeEntry entry = new InMemoryNodeEntry();
     SkyKey dep = key("dep");