Retry more connections in test suite

Follow-up to #1447

Author: lukebakken

projects/Test/Common/IntegrationFixtureBase.cs

@@ -118,7 +118,7 @@ protected virtual void SetUp()
 
             if (_conn == null)
             {
-                _conn = _connFactory.CreateConnection();
+                _conn = CreateConnectionWithRetries(_connFactory);
                 _channel = _conn.CreateChannel();
                 AddCallbackHandlers();
             }
@@ -209,27 +209,25 @@ internal AutorecoveringConnection CreateAutorecoveringConnection(IEnumerable<str
         internal AutorecoveringConnection CreateAutorecoveringConnection(IEnumerable<string> hostnames,
             TimeSpan requestedConnectionTimeout, TimeSpan networkRecoveryInterval, bool expectException = false)
         {
-            ConnectionFactory ConnectionFactoryConfigurator(ConnectionFactory cf)
+            if (hostnames is null)
             {
-                cf.AutomaticRecoveryEnabled = true;
-                // tests that use this helper will likely list unreachable hosts;
-                // make sure we time out quickly on those
-                cf.RequestedConnectionTimeout = requestedConnectionTimeout;
-                cf.NetworkRecoveryInterval = networkRecoveryInterval;
-                return cf;
+                throw new ArgumentNullException(nameof(hostnames));
             }
 
-            return (AutorecoveringConnection)CreateConnectionWithRetries(hostnames, ConnectionFactoryConfigurator, expectException);
-        }
+            var cf = new ConnectionFactory
+            {
+                AutomaticRecoveryEnabled = true,
+                // tests that use this helper will likely list unreachable hosts;
+                // make sure we time out quickly on those
+                RequestedConnectionTimeout = requestedConnectionTimeout,
+                NetworkRecoveryInterval = networkRecoveryInterval
+            };
 
-        protected IConnection CreateConnectionWithRetries(Func<ConnectionFactory, ConnectionFactory> connectionFactoryConfigurator)
-        {
-            var hostnames = new[] { "localhost" };
-            return CreateConnectionWithRetries(hostnames, connectionFactoryConfigurator);
+            return (AutorecoveringConnection)CreateConnectionWithRetries(cf, hostnames, expectException);
         }
 
-        protected IConnection CreateConnectionWithRetries(IEnumerable<string> hostnames,
-            Func<ConnectionFactory, ConnectionFactory> connectionFactoryConfigurator, bool expectException = false)
+        protected IConnection CreateConnectionWithRetries(ConnectionFactory connectionFactory,
+            IEnumerable<string> hostnames = null, bool expectException = false)
         {
             bool shouldRetry = IsWindows;
             ushort tries = 0;
@@ -238,9 +236,12 @@ protected IConnection CreateConnectionWithRetries(IEnumerable<string> hostnames,
             {
                 try
                 {
-                    ConnectionFactory cf0 = CreateConnectionFactory();
-                    ConnectionFactory cf1 = connectionFactoryConfigurator(cf0);
-                    return cf1.CreateConnection(hostnames);
+                    if (hostnames is null)
+                    {
+                        hostnames = new[] { "localhost" };
+                    }
+
+                    return connectionFactory.CreateConnection(hostnames);
                 }
                 catch (BrokerUnreachableException ex)
                 {

projects/Test/Integration/TestSsl.cs

@@ -29,7 +29,6 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
-using System;
 using System.IO;
 using System.Net.Security;
 using System.Security.Authentication;
@@ -60,32 +59,32 @@ public void TestServerVerifiedIgnoringNameMismatch()
         {
             Skip.IfNot(_sslEnv.IsSslConfigured, "SSL_CERTS_DIR and/or PASSWORD are not configured, skipping test");
 
-            ConnectionFactory ConnectionFactoryConfigurator(ConnectionFactory cf)
+            var cf = new ConnectionFactory
             {
-                cf.Port = 5671;
-                cf.Ssl.ServerName = "*";
-                cf.Ssl.AcceptablePolicyErrors = SslPolicyErrors.RemoteCertificateNameMismatch;
-                cf.Ssl.Enabled = true;
-                return cf;
-            }
+                Port = 5671
+            };
+
+            cf.Ssl.ServerName = "*";
+            cf.Ssl.AcceptablePolicyErrors = SslPolicyErrors.RemoteCertificateNameMismatch;
+            cf.Ssl.Enabled = true;
 
-            SendReceive(ConnectionFactoryConfigurator);
+            SendReceive(cf);
         }
 
         [SkippableFact]
         public void TestServerVerified()
         {
             Skip.IfNot(_sslEnv.IsSslConfigured, "SSL_CERTS_DIR and/or PASSWORD are not configured, skipping test");
 
-            ConnectionFactory ConnectionFactoryConfigurator(ConnectionFactory cf)
+            var cf = new ConnectionFactory
             {
-                cf.Port = 5671;
-                cf.Ssl.ServerName = _sslEnv.Hostname;
-                cf.Ssl.Enabled = true;
-                return cf;
-            }
+                Port = 5671,
+            };
 
-            SendReceive(ConnectionFactoryConfigurator);
+            cf.Ssl.ServerName = _sslEnv.Hostname;
+            cf.Ssl.Enabled = true;
+
+            SendReceive(cf);
         }
 
         [SkippableFact]
@@ -96,17 +95,17 @@ public void TestClientAndServerVerified()
             string certPath = _sslEnv.CertPath;
             Assert.True(File.Exists(certPath));
 
-            ConnectionFactory ConnectionFactoryConfigurator(ConnectionFactory cf)
+            var cf = new ConnectionFactory
             {
-                cf.Port = 5671;
-                cf.Ssl.ServerName = _sslEnv.Hostname;
-                cf.Ssl.CertPath = certPath;
-                cf.Ssl.CertPassphrase = _sslEnv.CertPassphrase;
-                cf.Ssl.Enabled = true;
-                return cf;
-            }
+                Port = 5671
+            };
 
-            SendReceive(ConnectionFactoryConfigurator);
+            cf.Ssl.ServerName = _sslEnv.Hostname;
+            cf.Ssl.CertPath = certPath;
+            cf.Ssl.CertPassphrase = _sslEnv.CertPassphrase;
+            cf.Ssl.Enabled = true;
+
+            SendReceive(cf);
         }
 
         // rabbitmq/rabbitmq-dotnet-client#46, also #44 and #45
@@ -115,28 +114,28 @@ public void TestNoClientCertificate()
         {
             Skip.IfNot(_sslEnv.IsSslConfigured, "SSL_CERTS_DIR and/or PASSWORD are not configured, skipping test");
 
-            ConnectionFactory ConnectionFactoryConfigurator(ConnectionFactory cf)
+            var cf = new ConnectionFactory
             {
-                cf.Port = 5671;
-                cf.Ssl = new SslOption()
-                {
-                    CertPath = null,
-                    Enabled = true,
-                    ServerName = _sslEnv.Hostname,
-                    Version = SslProtocols.None,
-                    AcceptablePolicyErrors =
-                        SslPolicyErrors.RemoteCertificateNotAvailable |
-                        SslPolicyErrors.RemoteCertificateNameMismatch
-                };
-                return cf;
-            }
+                Port = 5671
+            };
 
-            SendReceive(ConnectionFactoryConfigurator);
+            cf.Ssl = new SslOption()
+            {
+                CertPath = null,
+                Enabled = true,
+                ServerName = _sslEnv.Hostname,
+                Version = SslProtocols.None,
+                AcceptablePolicyErrors =
+                    SslPolicyErrors.RemoteCertificateNotAvailable |
+                    SslPolicyErrors.RemoteCertificateNameMismatch
+            };
+
+            SendReceive(cf);
         }
 
-        private void SendReceive(Func<ConnectionFactory, ConnectionFactory> cfconfig)
+        private void SendReceive(ConnectionFactory connectionFactory)
         {
-            using (IConnection conn = CreateConnectionWithRetries(cfconfig))
+            using (IConnection conn = CreateConnectionWithRetries(connectionFactory))
             {
                 using (IChannel ch = conn.CreateChannel())
                 {