From 225b57bfbb74a62a3212c7013ef92ce95ceaf79e Mon Sep 17 00:00:00 2001
From: ulfjack <ulfjack@google.com>
Date: Tue, 16 Jan 2018 12:44:15 -0800
Subject: Remove EventBus from SkyframeActionExecutor

Post to the Skyframe Environment instead.

PiperOrigin-RevId: 182096559
---
 .../com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java  | 3 ---
 .../google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/test/java/com/google')

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java
index e271d90237..cd5b31768f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java
@@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.util.concurrent.Runnables;
 import com.google.devtools.build.lib.actions.Action;
@@ -185,8 +184,6 @@ public class ParallelBuilderTest extends TimestampBuilderTestCase {
   public void testReportsActionExecutedEvent() throws Exception {
     Artifact pear = createDerivedArtifact("pear");
     ActionEventRecorder recorder = new ActionEventRecorder();
-    EventBus eventBus = new EventBus();
-    eventBusRef.set(eventBus);
     eventBus.register(recorder);
 
     Action action = registerAction(new TestAction(Runnables.doNothing(), emptySet, asSet(pear)));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
index e5a2ade4dc..8595811ec5 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -25,7 +25,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Range;
 import com.google.common.collect.Sets;
-import com.google.common.eventbus.EventBus;
 import com.google.devtools.build.lib.actions.Action;
 import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
 import com.google.devtools.build.lib.actions.ActionCacheChecker;
@@ -118,7 +117,6 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase {
   protected RecordingDifferencer differencer = new SequencedRecordingDifferencer();
   private Set<ActionAnalysisMetadata> actions;
 
-  protected AtomicReference<EventBus> eventBusRef = new AtomicReference<>();
   protected final ActionKeyContext actionKeyContext = new ActionKeyContext();
 
   @Before
@@ -179,8 +177,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase {
     ActionExecutionStatusReporter statusReporter =
         ActionExecutionStatusReporter.create(new StoredEventHandler());
     final SkyframeActionExecutor skyframeActionExecutor =
-        new SkyframeActionExecutor(
-            actionKeyContext, eventBusRef, new AtomicReference<>(statusReporter));
+        new SkyframeActionExecutor(actionKeyContext, new AtomicReference<>(statusReporter));
 
     Path actionOutputBase = scratch.dir("/usr/local/google/_blaze_jrluser/FAKEMD5/action_out/");
     skyframeActionExecutor.setActionLogBufferPathGenerator(
-- 
cgit v1.2.3