Merge pull request #1156 from rabbitmq/rabbitmq-dotnet-client-1140-6.x

Merge pull request #1148 from rabbitmq/rabbitmq-dotnet-client-1140

Author: lukebakken

projects/RabbitMQ.Client/client/impl/AutorecoveringModel.cs

@@ -441,12 +441,19 @@ public void AutomaticallyRecover(AutorecoveringConnection conn, bool recoverCons
                 newModel.TxSelect();
             }
 
+            /*
+             * https://github.com/rabbitmq/rabbitmq-dotnet-client/issues/1140
+             * If this assignment is not done before recovering consumers, there is a good
+             * chance that an invalid Model will be used to handle a basic.deliver frame,
+             * with the resulting basic.ack never getting sent out.
+             */
+            _delegate = newModel;
+
             if (recoverConsumers)
             {
                 _connection.RecoverConsumers(this, newModel);
             }
 
-            _delegate = newModel;
             RunRecoveryEventHandlers();
         }
 

projects/Unit/Fixtures.cs

@@ -675,6 +675,7 @@ internal void StopRabbitMQ()
         internal void StartRabbitMQ()
         {
             ExecRabbitMQCtl("start_app");
+            ExecRabbitMQCtl("await_startup");
         }
 
         //

projects/Unit/TestConnectionRecovery.cs

@@ -75,7 +75,6 @@ public void CleanUp()
         }
 
         [Test]
-        [Ignore("TODO flaky")]
         public void TestBasicAckAfterChannelRecovery()
         {
             var allMessagesSeenLatch = new ManualResetEventSlim(false);
@@ -98,7 +97,6 @@ public void TestBasicAckAfterChannelRecovery()
         }
 
         [Test]
-        [Ignore("TODO flaky")]
         public void TestBasicNackAfterChannelRecovery()
         {
             var allMessagesSeenLatch = new ManualResetEventSlim(false);
@@ -121,7 +119,6 @@ public void TestBasicNackAfterChannelRecovery()
         }
 
         [Test]
-        [Ignore("TODO flaky")]
         public void TestBasicRejectAfterChannelRecovery()
         {
             var allMessagesSeenLatch = new ManualResetEventSlim(false);
@@ -839,23 +836,23 @@ public void TestPublishRpcRightAfterReconnect()
             var properties = Model.CreateBasicProperties();
             properties.ReplyTo = "amq.rabbitmq.reply-to";
 
-            bool done = false;
+            TimeSpan doneSpan = TimeSpan.FromMilliseconds(100);
+            var done = new ManualResetEventSlim(false);
             var t = new Thread(() =>
             {
                 try
                 {
 
                     CloseAndWaitForRecovery();
-                    Thread.Sleep(100);
                 }
                 finally
                 {
-                    done = true;
+                    done.Set();
                 }
             });
             t.Start();
 
-            while (!done)
+            while (!done.IsSet)
             {
                 try
                 {
@@ -869,9 +866,8 @@ public void TestPublishRpcRightAfterReconnect()
                         Assert.AreNotEqual(406, a.ShutdownReason.ReplyCode);
                     }
                 }
-                Thread.Sleep(1);
+                done.Wait(doneSpan);
             }
-
             t.Join();
         }