* TestDisposedWithSocketClosedOutOfBand improvements

Author: lukebakken

projects/Test/Integration/TestAsyncConsumer.cs

@@ -186,9 +186,6 @@ public async Task TestBasicRoundtripConcurrentManyMessages()
                             {
                                 await publishChannel.ConfirmSelectAsync();
 
-                                QueueDeclareOk pubQ = await publishChannel.QueueDeclareAsync(queue: queueName, exclusive: false, durable: true);
-                                Assert.Equal(queueName, pubQ.QueueName);
-
                                 for (int i = 0; i < publish_total; i++)
                                 {
                                     await publishChannel.BasicPublishAsync(string.Empty, queueName, body1);

projects/Test/Integration/TestConnectionShutdown.cs

@@ -100,13 +100,20 @@ public async Task TestDisposedWithSocketClosedOutOfBand()
             };
 
             var c = (AutorecoveringConnection)_conn;
-            await c.CloseFrameHandlerAsync();
+            Task frameHandlerCloseTask = c.CloseFrameHandlerAsync();
 
-            _conn.Dispose();
-            _conn = null;
+            try
+            {
+                _conn.Dispose();
+                await WaitAsync(tcs, WaitSpan, "channel shutdown");
+                await frameHandlerCloseTask.WaitAsync(WaitSpan);
+            }
+            finally
+            {
+                _conn = null;
+                _channel = null;
+            }
 
-            TimeSpan waitSpan = TimeSpan.FromSeconds(10);
-            await WaitAsync(tcs, waitSpan, "channel shutdown");
         }
 
         [Fact]