Use a 10-second timeout to close connections in tests

Author: acogoluegnes

src/test/java/com/rabbitmq/client/AbstractJsonRpcTest.java

@@ -68,8 +68,8 @@ public void tearDown() throws Exception {
         if (serverChannel != null) {
             serverChannel.queueDelete(queue);
         }
-        clientConnection.close();
-        serverConnection.close();
+        clientConnection.close(10_000);
+        serverConnection.close(10_000);
     }
 
     public interface RpcService {

src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java

@@ -167,30 +167,30 @@ public class AMQConnectionTest {
         String providedName = "event consumers connection";
         Connection connection = factory.newConnection(providedName);
         assertEquals(providedName, connection.getClientProvidedName());
-        connection.close();
+        connection.close(10_000);
 
         List<Address> addrs1 = Arrays.asList(new Address("127.0.0.1"), new Address("127.0.0.1", 5672));
         connection = factory.newConnection(addrs1, providedName);
         assertEquals(providedName, connection.getClientProvidedName());
-        connection.close();
+        connection.close(10_000);
 
         Address[] addrs2 = {new Address("127.0.0.1"), new Address("127.0.0.1", 5672)};
         connection = factory.newConnection(addrs2, providedName);
         assertEquals(providedName, connection.getClientProvidedName());
-        connection.close();
+        connection.close(10_000);
 
         ExecutorService xs = Executors.newSingleThreadExecutor();
         connection = factory.newConnection(xs, providedName);
         assertEquals(providedName, connection.getClientProvidedName());
-        connection.close();
+        connection.close(10_000);
 
         connection = factory.newConnection(xs, addrs1, providedName);
         assertEquals(providedName, connection.getClientProvidedName());
-        connection.close();
+        connection.close(10_000);
 
         connection = factory.newConnection(xs, addrs2, providedName);
         assertEquals(providedName, connection.getClientProvidedName());
-        connection.close();
+        connection.close(10_000);
     }
 
     /** Mock frame handler to facilitate testing. */

src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java

@@ -95,7 +95,7 @@ void shutdownListenerShouldBeCalledWhenChannelDies() throws Exception {
       if (blocked) {
         unblock();
       }
-      c.close();
+      c.close(10_000);
     }
   }
 }

src/test/java/com/rabbitmq/client/test/BrokerTestCase.java

@@ -21,6 +21,8 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Map;
@@ -33,6 +35,8 @@
 
 public class BrokerTestCase {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(BrokerTestCase.class);
+
     private String brokerVersion;
 
     protected volatile TestInfo testInfo;
@@ -132,7 +136,11 @@ public void openConnection()
     public void closeConnection()
             throws IOException {
         if (connection != null) {
-            connection.abort();
+            try {
+                connection.abort(10_000);
+            } catch (Exception e) {
+                LOGGER.warn("Error while closing connection: {}", e.getMessage());
+            }
             connection = null;
         }
     }

src/test/java/com/rabbitmq/client/test/ChannelNumberAllocationTests.java

@@ -46,7 +46,7 @@ public int compare(Channel x, Channel y){
   }
 
   @AfterEach public void tearDown() throws Exception{
-    connection.close();
+    connection.close(10_000);
     connection = null;
   }
 

src/test/java/com/rabbitmq/client/test/ChannelRpcTimeoutIntegrationTest.java

@@ -55,7 +55,7 @@ public void tearDown() {
             Channel channel = connection.createChannel();
             channel.queueDeclare();
         } finally {
-            connection.close();
+            connection.close(10_000);
         }
 
     }
@@ -78,7 +78,7 @@ public void tearDown() {
                 assertThat(e.getMethod()).isInstanceOf(AMQP.Queue.Declare.class);
             }
         } finally {
-            connection.close();
+            connection.close(10_000);
         }
     }
 

src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java

@@ -93,7 +93,7 @@ public boolean processControlCommand(Command c) throws IOException{
 
   @Test public void closeOKNormallyReceived() throws Exception{
     SpecialConnection connection = new SpecialConnection();
-    connection.close();
+    connection.close(10_000);
     assertTrue(connection.hadValidShutdown());
   }
 

src/test/java/com/rabbitmq/client/test/DnsRecordIpAddressResolverTests.java

@@ -23,7 +23,7 @@ public class DnsRecordIpAddressResolverTests extends BrokerTestCase {
         try {
             connection.createChannel();
         } finally {
-            connection.abort();
+            connection.abort(10_000);
         }
     }
 
@@ -34,7 +34,7 @@ public class DnsRecordIpAddressResolverTests extends BrokerTestCase {
         try {
             connection.createChannel();
         } finally {
-            connection.abort();
+            connection.abort(10_000);
         }
     }
 

src/test/java/com/rabbitmq/client/test/NoAutoRecoveryWhenTcpWindowIsFullTest.java

@@ -155,7 +155,7 @@ public void handleRecoveryStarted(Recoverable recoverable) {
 
     private void closeConnectionIfOpen(Connection connection) throws IOException {
         if (connection.isOpen()) {
-            connection.close();
+            connection.close(10_000);
         }
     }
 

src/test/java/com/rabbitmq/client/test/QueueingConsumerTests.java

@@ -61,7 +61,7 @@ public class QueueingConsumerTests extends BrokerTestCase{
       }.start();
     }
 
-    connection.close();
+    connection.close(10_000);
 
     // Far longer than this could reasonably take
     assertTrue(latch.await(5, TimeUnit.SECONDS));