From 0f2a4d02e0ee9352fd1210752dfcba08fc352186 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 13 Aug 2025 15:46:52 -0400
Subject: [PATCH] Revert "Add a (failing!) test for dropped errors during
 `WebSocketConnectionTest`"

This reverts commit fc8d180f7c3eef40de2da823a8dbc6d4e7be8193.
---
 .../websocket/WebSocketConnectionTest.java    | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java
index 19f29a583..9b8d44963 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java
@@ -5,7 +5,6 @@
 
 package org.whispersystems.textsecuregcm.websocket;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -33,10 +32,7 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -61,7 +57,6 @@ import org.whispersystems.websocket.WebSocketClient;
 import org.whispersystems.websocket.messages.WebSocketResponseMessage;
 import reactor.adapter.JdkFlowAdapter;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.Hooks;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 import reactor.test.StepVerifier;
@@ -84,37 +79,20 @@ class WebSocketConnectionTest {
 
   private static final int SOURCE_DEVICE_ID = 1;
 
-  private static final AtomicInteger ON_ERROR_DROPPED_COUNTER = new AtomicInteger();
-
-  @BeforeAll
-  static void setUpBeforeAll() {
-    Hooks.onErrorDropped(_ -> ON_ERROR_DROPPED_COUNTER.incrementAndGet());
-  }
-
   @BeforeEach
-  void setUp() {
+  void setup() {
     account = mock(Account.class);
     device = mock(Device.class);
     messagesManager = mock(MessagesManager.class);
     receiptSender = mock(ReceiptSender.class);
     messageDeliveryScheduler = Schedulers.newBoundedElastic(10, 10_000, "messageDelivery");
     clientReleaseManager = mock(ClientReleaseManager.class);
-
-    ON_ERROR_DROPPED_COUNTER.set(0);
   }
 
   @AfterEach
-  void tearDown() {
+  void teardown() {
     StepVerifier.resetDefaultTimeout();
     messageDeliveryScheduler.dispose();
-
-    assertEquals(0, ON_ERROR_DROPPED_COUNTER.get(),
-        "Errors dropped during test");
-  }
-
-  @AfterAll
-  static void tearDownAfterAll() {
-    Hooks.resetOnErrorDropped();
   }
 
   private WebSocketConnection buildWebSocketConnection(final WebSocketClient client) {