Fix some more tests.

Author: lukebakken

projects/Test/SequentialIntegration/SequentialIntegrationFixture.cs

@@ -48,10 +48,12 @@ public async Task BlockAsync()
             await Task.Delay(TimeSpan.FromSeconds(1));
         }
 
-        public async Task BlockAsync(IChannel channel)
+        public async Task BlockAndPublishAsync()
         {
+            // TODO fix publisher confirmation tracking to time out so this test succeeds
+            await using IChannel ch = await _conn.CreateChannelAsync(publisherConfirmationsEnabled: false);
             await BlockAsync();
-            await channel.BasicPublishAsync(exchange: "amq.direct",
+            await ch.BasicPublishAsync(exchange: "amq.direct",
                 routingKey: Guid.NewGuid().ToString(), _encoding.GetBytes("message"));
         }
 

projects/Test/SequentialIntegration/TestConnectionBlocked.cs

@@ -60,10 +60,10 @@ public override async Task DisposeAsync()
         public async Task TestConnectionBlockedNotification()
         {
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-            _conn.ConnectionBlockedAsync += async (object sender, ConnectionBlockedEventArgs args) =>
+            _conn.ConnectionBlockedAsync += (object sender, ConnectionBlockedEventArgs args) =>
             {
-                // TODO should this continue to be doing fire and forget?
-                await UnblockAsync();
+                UnblockAsync();
+                return Task.CompletedTask;
             };
 
             _conn.ConnectionUnblockedAsync += (object sender, AsyncEventArgs ea) =>
@@ -72,7 +72,7 @@ public async Task TestConnectionBlockedNotification()
                 return Task.CompletedTask;
             };
 
-            await BlockAsync(_channel);
+            await BlockAndPublishAsync();
             await tcs.Task.WaitAsync(TimeSpan.FromSeconds(15));
             Assert.True(await tcs.Task, "Unblock notification not received.");
         }
@@ -82,7 +82,7 @@ public async Task TestDisposeOnBlockedConnectionDoesNotHang()
         {
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
-            await BlockAsync(_channel);
+            await BlockAndPublishAsync();
 
             Task disposeTask = Task.Run(async () =>
             {

projects/Test/SequentialIntegration/TestConnectionRecovery.cs

@@ -145,23 +145,16 @@ Task _channel_ChannelShutdownAsync(object sender, ShutdownEventArgs e)
         [Fact]
         public async Task TestBlockedListenersRecovery()
         {
-            try
-            {
-                var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                _conn.ConnectionBlockedAsync += (c, reason) =>
-                {
-                    tcs.SetResult(true);
-                    return Task.CompletedTask;
-                };
-                await CloseAndWaitForRecoveryAsync();
-                await CloseAndWaitForRecoveryAsync();
-                await BlockAsync(_channel);
-                await WaitAsync(tcs, "connection blocked");
-            }
-            finally
+            var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+            _conn.ConnectionBlockedAsync += (c, reason) =>
             {
-                await UnblockAsync();
-            }
+                tcs.SetResult(true);
+                return Task.CompletedTask;
+            };
+            await CloseAndWaitForRecoveryAsync();
+            await CloseAndWaitForRecoveryAsync();
+            await BlockAndPublishAsync();
+            await WaitAsync(tcs, "connection blocked");
         }
 
         [Fact]
@@ -340,7 +333,7 @@ public async Task TestUnblockedListenersRecovery()
             };
             await CloseAndWaitForRecoveryAsync();
             await CloseAndWaitForRecoveryAsync();
-            await BlockAsync(_channel);
+            await BlockAndPublishAsync();
             await UnblockAsync();
             await WaitAsync(tcs, "connection unblocked");
         }