Merge pull request #1450 from rabbitmq/rabbitmq-dotnet-client-1086

Add test that demonstrates the current behavior of a recovered channe…

Author: lukebakken

projects/Test/Common/RabbitMQCtl.cs

@@ -32,7 +32,6 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Text;
 using System.Text.RegularExpressions;
 using RabbitMQ.Client;
 using Xunit.Abstractions;
@@ -188,12 +187,6 @@ private static bool IsRunningOnMonoOrDotNetCore()
 #endif
         }
 
-        private static void Publish(IConnection conn, Encoding encoding)
-        {
-            IChannel ch = conn.CreateChannel();
-            ch.BasicPublish("amq.fanout", "", encoding.GetBytes("message"));
-        }
-
         private static Process CreateProcess(string cmd, string arguments, string workDirectory = null)
         {
             return new Process

projects/Test/SequentialIntegration/TestConnectionRecovery.cs

@@ -194,6 +194,60 @@ public void TestBasicChannelRecoveryOnServerRestart()
             Assert.True(_channel.IsOpen);
         }
 
+        // https://github.com/rabbitmq/rabbitmq-dotnet-client/issues/1086
+        [Fact]
+        public async Task TestChannelAfterDispose_GH1086()
+        {
+            TaskCompletionSource<bool> sawChannelShutdownTcs = new TaskCompletionSource<bool>();
+
+            void _channel_ChannelShutdown(object sender, ShutdownEventArgs e)
+            {
+                sawChannelShutdownTcs.SetResult(true);
+            }
+
+            _channel.ChannelShutdown += _channel_ChannelShutdown;
+
+            Assert.True(_channel.IsOpen);
+
+            string queueName = GenerateQueueName();
+            RabbitMQ.Client.QueueDeclareOk queueDeclareOk = await _channel.QueueDeclareAsync(queue: queueName, exclusive: false, autoDelete: false);
+            Assert.Equal(queueName, queueDeclareOk.QueueName);
+
+            byte[] body = GetRandomBody(64);
+
+            RestartServerAndWaitForRecovery();
+
+            Task publishTask = Task.Run(async () =>
+            {
+                while (false == sawChannelShutdownTcs.Task.IsCompleted)
+                {
+                    try
+                    {
+                        await _channel.BasicPublishAsync(exchange: "", routingKey: queueName, body: body, mandatory: true);
+                        await Task.Delay(TimeSpan.FromSeconds(1));
+                    }
+                    catch (Exception ex)
+                    {
+                        _output.WriteLine($"{_testDisplayName} caught exception: {ex}");
+                        break;
+                    }
+                }
+            });
+
+            await Task.WhenAny(sawChannelShutdownTcs.Task, publishTask);
+
+            bool sawChannelShutdown = await sawChannelShutdownTcs.Task;
+            Assert.True(sawChannelShutdown);
+
+            // This is false because the channel has been recovered
+            Assert.False(_channel.IsClosed);
+
+            _channel.Dispose();
+            Assert.True(_channel.IsClosed);
+
+            await publishTask;
+        }
+
         [Fact]
         public void TestBlockedListenersRecovery()
         {