Introduce QuiescingExecutor

This interface (mostly) encapsulates what the ValueVisitor expects
from the AbstractQueueVisitor class it currently inherits from. This
makes it easier for a future CL to change ValueVisitor's strategy of
code reuse from inheritance to composition.

RELNOTES:

--
MOS_MIGRATED_REVID=106728863

1 files changed, 10 insertions, 9 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java b/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java
index d9fb1a3080..832ee7242d 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java
@@ -139,14 +139,15 @@ public class ConcurrentMultimapWithHeadElementTest {
     }
 
     private void addAndRemove(final Boolean key, final Integer add, final Integer remove) {
-      enqueue(new Runnable() {
-        @Override
-        public void run() {
-          assertNotNull(multimap.putAndGet(key, add));
-          multimap.remove(key, remove);
-          doRandom();
-        }
-      });
+      execute(
+          new Runnable() {
+            @Override
+            public void run() {
+              assertNotNull(multimap.putAndGet(key, add));
+              multimap.remove(key, remove);
+              doRandom();
+            }
+          });
     }
 
     private Integer getRandomInt() {
@@ -162,7 +163,7 @@ public class ConcurrentMultimapWithHeadElementTest {
     }
 
     private void work() throws InterruptedException {
-      work(/*failFastOnInterrupt=*/true);
+      awaitQuiescence(/*interruptWorkers=*/ true);
     }
   }