Clean up resources correctly in connection recovery tests, fingers crossed...

Author: lukebakken

projects/Unit/Fixtures.cs

@@ -43,7 +43,7 @@
 
 namespace RabbitMQ.Client.Unit
 {
-
+    [Collection("IntegrationFixture")]
     public class IntegrationFixture : IDisposable
     {
         internal IConnectionFactory _connFactory;

projects/Unit/RabbitMQCtl.cs

@@ -217,6 +217,7 @@ public static void RestartRabbitMQ()
             StopRabbitMQ();
             Thread.Sleep(500);
             StartRabbitMQ();
+            AwaitRabbitMQ();
         }
 
         public static void StopRabbitMQ()

projects/Unit/TestBlockingCell.cs

@@ -38,7 +38,6 @@
 
 namespace RabbitMQ.Client.Unit
 {
-
     public class TestBlockingCell : TimingFixture
     {
         internal class DelayedSetter<T>

projects/Unit/TestConnectionRecovery.cs

@@ -45,24 +45,6 @@
 
 namespace RabbitMQ.Client.Unit
 {
-    [CollectionDefinition("NoParallelization", DisableParallelization = true)]
-    public class NoParallelizationCollection { }
-    class DisposableConnection : IDisposable
-    {
-        public DisposableConnection(AutorecoveringConnection c)
-        {
-            Connection = c;
-        }
-
-        public AutorecoveringConnection Connection { get; }
-
-        public void Dispose()
-        {
-            Connection.Close();
-        }
-    }
-
-    [Collection("NoParallelization")]
     public class TestConnectionRecovery : IntegrationFixture
     {
         private readonly byte[] _messageBody;
@@ -85,10 +67,20 @@ protected override void SetUp()
             _model.QueueDelete(_queueName);
         }
 
-        public override void Dispose()
+        protected override void ReleaseResources()
         {
-            _conn.Close();
+            // TODO LRB not really necessary
+            if (_model.IsOpen)
+            {
+                _model.Close();
+            }
+
+            if (_conn.IsOpen)
+            {
+                _conn.Close();
+            }
 
+            Unblock();
         }
 
         [Fact]
@@ -704,7 +696,7 @@ public void TestRecoveryEventHandlersOnModel()
             Assert.True(counter >= 3);
         }
 
-        [Fact(Skip="FLAKY")]
+        [Fact]
         public void TestRecoveryWithTopologyDisabled()
         {
             AutorecoveringConnection conn = CreateAutorecoveringConnectionWithTopologyRecoveryDisabled();
@@ -1097,11 +1089,6 @@ internal static ManualResetEventSlim PrepareForShutdown(IConnection conn)
             return latch;
         }
 
-        protected override void ReleaseResources()
-        {
-            Unblock();
-        }
-
         internal void RestartServerAndWaitForRecovery()
         {
             RestartServerAndWaitForRecovery((AutorecoveringConnection)_conn);