* Restore TestDisposedWithSocketClosedOutOfBand and don't immediately await the frame handler close.

Author: lukebakken

projects/Test/Integration/TestConnectionShutdown.cs

@@ -31,7 +31,6 @@
 
 using System;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Exceptions;
@@ -93,48 +92,27 @@ public async Task TestAbortWithSocketClosedOutOfBand()
         [Fact]
         public async Task TestDisposedWithSocketClosedOutOfBand()
         {
-            await _channel.CloseAsync();
-            await _conn.CloseAsync();
+            var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+            _channel.ChannelShutdown += (channel, args) =>
+            {
+                _output.WriteLine("_channel.ChannelShutdown called");
+                tcs.SetResult(true);
+            };
+
+            var c = (AutorecoveringConnection)_conn;
+            Task frameHandlerCloseTask = c.CloseFrameHandlerAsync();
+
             try
             {
-                // RmqDebug.Verbose(true);
-                // Console.SetOut(new TestOutputWriter(_output, _testDisplayName));
-                var cf = new ConnectionFactory { AutomaticRecoveryEnabled = false };
-                _conn = await cf.CreateConnectionAsync();
-                _channel = await _conn.CreateChannelAsync();
-
-                var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-                _channel.ChannelShutdown += (channel, args) =>
-                {
-                    _output.WriteLine("_channel.ChannelShutdown called");
-                    tcs.SetResult(true);
-                };
-
-                // var c = (AutorecoveringConnection)_conn;
-                // await c.CloseFrameHandlerAsync();
-                var c = (Connection)_conn;
-                await c.FrameHandler.CloseAsync(CancellationToken.None);
-
-                try
-                {
-                    _conn.Dispose();
-                    await WaitAsync(tcs, TimeSpan.FromSeconds(60), "channel shutdown");
-                }
-                finally
-                {
-                    _conn = null;
-                    _channel = null;
-                }
+                _conn.Dispose();
+                await WaitAsync(tcs, WaitSpan, "channel shutdown");
+                await frameHandlerCloseTask.WaitAsync(WaitSpan);
             }
             finally
             {
-                RmqDebug.Verbose(false);
-                var standardOutput = new StreamWriter(Console.OpenStandardOutput())
-                {
-                    AutoFlush = true
-                };
-                Console.SetOut(standardOutput);
+                _conn = null;
+                _channel = null;
             }
         }