Increase connection timeout for CI

Author: lukebakken

projects/RabbitMQ.Client/client/api/ITcpClient.cs

@@ -19,7 +19,7 @@ public interface ITcpClient : IDisposable
 
         Socket Client { get; }
 
-        Task ConnectAsync(string host, int port, TimeSpan connectionTimeout, CancellationToken cancellationToken);
+        // TODO cancellationToken should be the only parameter
         Task ConnectAsync(IPAddress host, int port, TimeSpan connectionTimeout, CancellationToken cancellationToken);
 
         NetworkStream GetStream();

projects/RabbitMQ.Client/client/api/TcpClientAdapter.cs

@@ -21,44 +21,15 @@ public TcpClientAdapter(Socket socket)
         }
 
 #if NET6_0_OR_GREATER
-        public virtual async Task ConnectAsync(string host, int port, TimeSpan connectionTimeout, CancellationToken cancellationToken)
-        {
-            AssertSocket();
-            IPAddress[] adds = await Dns.GetHostAddressesAsync(host)
-                .ConfigureAwait(false);
-            IPAddress ep = GetMatchingHost(adds, _sock.AddressFamily);
-            if (ep == default(IPAddress))
-            {
-                throw new ArgumentException($"No ip address could be resolved for {host}");
-            }
-
-            await ConnectAsync(ep, port, connectionTimeout, cancellationToken)
-                .ConfigureAwait(false);
-        }
-
         public virtual Task ConnectAsync(IPAddress ep, int port, TimeSpan connectionTimeout, CancellationToken cancellationToken)
         {
             AssertSocket();
             return _sock.ConnectAsync(ep, port, cancellationToken).AsTask();
         }
 #else
-        public virtual async Task ConnectAsync(string host, int port, TimeSpan connectionTimeout, CancellationToken cancellationToken)
-        {
-            AssertSocket();
-            IPAddress[] adds = await Dns.GetHostAddressesAsync(host)
-                .ConfigureAwait(false);
-            IPAddress ep = GetMatchingHost(adds, _sock.AddressFamily);
-            if (ep == default(IPAddress))
-            {
-                throw new ArgumentException($"No ip address could be resolved for {host}");
-            }
-
-            await ConnectAsync(ep, port, connectionTimeout, cancellationToken)
-                .ConfigureAwait(false);
-        }
-
         public virtual Task ConnectAsync(IPAddress ep, int port, TimeSpan connectionTimeout, CancellationToken cancellationToken)
         {
+            // TODO cancellationToken should be the only parameter
             return _sock.ConnectAsync(ep, port).TimeoutAfter(connectionTimeout);
         }
 #endif

projects/Test/Common/IntegrationFixtureBase.cs

@@ -65,6 +65,7 @@ public abstract class IntegrationFixtureBase : IDisposable
         public static readonly TimeSpan LongWaitSpan;
         public static readonly TimeSpan RecoveryInterval = TimeSpan.FromSeconds(2);
         public static readonly TimeSpan TestTimeout = TimeSpan.FromSeconds(5);
+        public static readonly TimeSpan RequestedConnectionTimeout = TimeSpan.FromSeconds(1);
         public static readonly Random S_Random;
 
         static IntegrationFixtureBase()
@@ -78,6 +79,7 @@ static IntegrationFixtureBase()
             {
                 WaitSpan = TimeSpan.FromSeconds(60);
                 LongWaitSpan = TimeSpan.FromSeconds(120);
+                RequestedConnectionTimeout = TimeSpan.FromSeconds(5);
             }
             else
             {
@@ -196,17 +198,19 @@ protected static bool IsVerbose
 
         internal AutorecoveringConnection CreateAutorecoveringConnection(IList<string> hostnames)
         {
-            return CreateAutorecoveringConnection(RecoveryInterval, hostnames);
+
+            return CreateAutorecoveringConnection(hostnames, RequestedConnectionTimeout, RecoveryInterval);
         }
 
-        internal AutorecoveringConnection CreateAutorecoveringConnection(TimeSpan interval, IList<string> hostnames)
+        internal AutorecoveringConnection CreateAutorecoveringConnection(IEnumerable<string> hostnames,
+            TimeSpan requestedConnectionTimeout, TimeSpan networkRecoveryInterval)
         {
-            var cf = CreateConnectionFactory();
+            ConnectionFactory cf = CreateConnectionFactory();
             cf.AutomaticRecoveryEnabled = true;
             // tests that use this helper will likely list unreachable hosts;
             // make sure we time out quickly on those
-            cf.RequestedConnectionTimeout = TimeSpan.FromMilliseconds(2500);
-            cf.NetworkRecoveryInterval = interval;
+            cf.RequestedConnectionTimeout = requestedConnectionTimeout;
+            cf.NetworkRecoveryInterval = networkRecoveryInterval;
             return (AutorecoveringConnection)cf.CreateConnection(hostnames);
         }
 

projects/Test/Unit/APIApproval.Approve.verified.txt

@@ -713,7 +713,6 @@ namespace RabbitMQ.Client
         System.TimeSpan ReceiveTimeout { get; set; }
         void Close();
         System.Threading.Tasks.Task ConnectAsync(System.Net.IPAddress host, int port, System.TimeSpan connectionTimeout, System.Threading.CancellationToken cancellationToken);
-        System.Threading.Tasks.Task ConnectAsync(string host, int port, System.TimeSpan connectionTimeout, System.Threading.CancellationToken cancellationToken);
         System.Net.Sockets.NetworkStream GetStream();
     }
     public class PlainMechanism : RabbitMQ.Client.IAuthMechanism
@@ -833,7 +832,6 @@ namespace RabbitMQ.Client
         public virtual System.TimeSpan ReceiveTimeout { get; set; }
         public virtual void Close() { }
         public virtual System.Threading.Tasks.Task ConnectAsync(System.Net.IPAddress ep, int port, System.TimeSpan connectionTimeout, System.Threading.CancellationToken cancellationToken) { }
-        public virtual System.Threading.Tasks.Task ConnectAsync(string host, int port, System.TimeSpan connectionTimeout, System.Threading.CancellationToken cancellationToken) { }
         public void Dispose() { }
         protected virtual void Dispose(bool disposing) { }
         public virtual System.Net.Sockets.NetworkStream GetStream() { }