Fix flaky test and ensure RabbitMQ is fully started after stopping in a test.

Author: lukebakken

_site

@@ -382,6 +382,7 @@ internal void StopRabbitMQ()
         internal void StartRabbitMQ()
         {
             RabbitMQCtl.StartRabbitMQ();
+            RabbitMQCtl.AwaitRabbitMQ();
         }
 
         //

projects/Unit/Fixtures.cs

@@ -228,5 +228,10 @@ public static void StartRabbitMQ()
         {
             ExecRabbitMQCtl("start_app");
         }
+
+        public static void AwaitRabbitMQ()
+        {
+            ExecRabbitMQCtl("await_startup");
+        }
     }
 }

projects/Unit/RabbitMQCtl.cs

@@ -851,22 +851,22 @@ public void TestPublishRpcRightAfterReconnect()
             var properties = new BasicProperties();
             properties.ReplyTo = "amq.rabbitmq.reply-to";
 
-            bool done = false;
+            TimeSpan doneSpan = TimeSpan.FromMilliseconds(100);
+            var done = new ManualResetEventSlim(false);
             Task.Run(() =>
             {
                 try
                 {
 
                     CloseAndWaitForRecovery();
-                    Thread.Sleep(500);
                 }
                 finally
                 {
-                    done = true;
+                    done.Set();
                 }
             });
 
-            while (!done)
+            while (!done.IsSet)
             {
                 try
                 {
@@ -880,7 +880,7 @@ public void TestPublishRpcRightAfterReconnect()
                         Assert.NotEqual(406, a.ShutdownReason.ReplyCode);
                     }
                 }
-                Thread.Sleep(1);
+                done.Wait(doneSpan);
             }
         }