Merge pull request #1158 from rabbitmq/rabbitmq-dotnet-client-1140-7.x

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

Author: lukebakken

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

@@ -409,6 +409,12 @@ public void AutomaticallyRecover(AutorecoveringConnection conn)
             _connection = conn;
             RecoveryAwareModel defunctModel = _delegate;
 
+            /*
+             * 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 = conn.CreateNonRecoveringModel();
             _delegate.InheritOffsetFrom(defunctModel);
 
@@ -419,7 +425,6 @@ public void AutomaticallyRecover(AutorecoveringConnection conn)
             RecoverBasicAckHandlers();
             RecoverBasicNackHandlers();
             RecoverCallbackExceptionHandlers();
-
             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);