CR: delay it all

Author: original-brownbear

test/framework/src/main/java/org/elasticsearch/test/disruption/DisruptableMockTransport.java

@@ -205,12 +205,9 @@ public void run() {
                                 break;
 
                             case BLACK_HOLE:
-                                logger.trace("blackholed during response to {}: channel is {}", requestDescription, connectionStatus);
-                                onBlackholedDuringSend(requestId, action, destinationTransport);
-                                break;
                             case DISCONNECTED:
-                                logger.trace("disconnected during response to {}: channel is {}", requestDescription, connectionStatus);
-                                onDisconnectedDuringSend(requestId, action, destinationTransport);
+                                logger.trace("delaying response to {}: channel is {}", requestDescription, connectionStatus);
+                                onBlackholedDuringSend(requestId, action, destinationTransport);
                                 break;
 
                             default:
@@ -239,14 +236,10 @@ public void run() {
                                 break;
 
                             case BLACK_HOLE:
-                                logger.trace("blackholed during exception response to {}: channel is {}",
-                                        requestDescription, connectionStatus);
-                                onBlackholedDuringSend(requestId, action, destinationTransport);
-                                break;
                             case DISCONNECTED:
-                                logger.trace("disconnected during exception response to {}: channel is {}",
+                                logger.trace("delaying exception response to {}: channel is {}",
                                         requestDescription, connectionStatus);
-                                onDisconnectedDuringSend(requestId, action, destinationTransport);
+                                onBlackholedDuringSend(requestId, action, destinationTransport);
                                 break;
 
                             default:

test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java

@@ -327,7 +327,7 @@ public void testDisconnectedOnSuccessfulResponse() throws IOException {
 
         disconnectedLinks.add(Tuple.tuple(node2, node1));
         responseHandlerChannel.get().sendResponse(TransportResponse.Empty.INSTANCE);
-        deterministicTaskQueue.runAllRunnableTasks();
+        deterministicTaskQueue.runAllTasks();
         assertThat(responseHandlerException.get(), instanceOf(ConnectTransportException.class));
     }
 
@@ -344,7 +344,7 @@ public void testDisconnectedOnExceptionalResponse() throws IOException {
 
         disconnectedLinks.add(Tuple.tuple(node2, node1));
         responseHandlerChannel.get().sendResponse(new Exception());
-        deterministicTaskQueue.runAllRunnableTasks();
+        deterministicTaskQueue.runAllTasks();
         assertThat(responseHandlerException.get(), instanceOf(ConnectTransportException.class));
     }