1 files changed, 4 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransportTest.java b/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransportTest.java
index 2dcdf2543e..e5c119deaa 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransportTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransportTest.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.skylarkdebug.server;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.events.util.EventCollectionApparatus;
 import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ContinueExecutionResponse;
@@ -48,17 +47,6 @@ public class DebugServerTransportTest {
   private final EventCollectionApparatus events =
       new EventCollectionApparatus(EventKind.ALL_EVENTS);
 
-  /**
-   * The default fail-fast {@link EventHandler} fails on debug-level events, so we instead use a
-   * handler suppressing those events.
-   */
-  private final EventHandler eventHandler =
-      event -> {
-        if (event.getKind() != EventKind.DEBUG) {
-          events.reporter().handle(event);
-        }
-      };
-
   /** A simple debug client for testing purposes. */
   private static class MockDebugClient {
 
@@ -100,7 +88,8 @@ public class DebugServerTransportTest {
     Future<DebugServerTransport> future =
         executor.submit(
             () ->
-                DebugServerTransport.createAndWaitForClient(eventHandler, serverSocket));
+                DebugServerTransport.createAndWaitForClient(
+                    events.reporter(), serverSocket, false));
     MockDebugClient client = new MockDebugClient();
     client.connect(Duration.ofSeconds(10), serverSocket);
 
@@ -123,7 +112,8 @@ public class DebugServerTransportTest {
     Future<DebugServerTransport> future =
         executor.submit(
             () ->
-                DebugServerTransport.createAndWaitForClient(eventHandler, serverSocket));
+                DebugServerTransport.createAndWaitForClient(
+                    events.reporter(), serverSocket, false));
     MockDebugClient client = new MockDebugClient();
     client.connect(Duration.ofSeconds(10), serverSocket);