Tests: ensure setup on each failover run

StackExchange.Redis.Tests/Failover.cs

@@ -9,7 +9,30 @@ namespace StackExchange.Redis.Tests
     public class Failover : TestBase
     {
         protected override string GetConfiguration() => GetMasterSlaveConfig().ToString();
-        public Failover(ITestOutputHelper output) : base(output) { }
+
+        public Failover(ITestOutputHelper output) : base(output)
+        {
+            using (var mutex = Create())
+            {
+                var shouldBeMaster = mutex.GetServer(TestConfig.Current.FailoverMasterServerAndPort);
+                if (shouldBeMaster.IsSlave)
+                {
+                    Output.WriteLine(shouldBeMaster.EndPoint + " should be master, fixing...");
+                    shouldBeMaster.MakeMaster(ReplicationChangeOptions.SetTiebreaker);
+                }
+
+                Output.WriteLine("Flushing all databases...");
+                shouldBeMaster.FlushAllDatabases(CommandFlags.FireAndForget);
+
+                var shouldBeReplica = mutex.GetServer(TestConfig.Current.FailoverSlaveServerAndPort);
+                if (!shouldBeReplica.IsSlave)
+                {
+                    Output.WriteLine(shouldBeReplica.EndPoint + " should be a slave, fixing...");
+                    shouldBeReplica.SlaveOf(shouldBeMaster.EndPoint);
+                    Thread.Sleep(2000);
+                }
+            }
+        }
 
         private static ConfigurationOptions GetMasterSlaveConfig()
         {
@@ -154,10 +177,6 @@ public async Task SubscriptionsSurviveMasterSwitchAsync(bool useSharedSocketMana
             using (var a = Create(allowAdmin: true, useSharedSocketManager: useSharedSocketManager))
             using (var b = Create(allowAdmin: true, useSharedSocketManager: useSharedSocketManager))
             {
-                try
-                {
-                    // Ensure config setup
-                    await EnsureMasterSlaveSetupAsync(a).ForAwait();
                 RedisChannel channel = Me();
                 var subA = a.GetSubscriber();
                 var subB = b.GetSubscriber();
@@ -257,33 +276,6 @@ public async Task SubscriptionsSurviveMasterSwitchAsync(bool useSharedSocketMana
                     catch { }
                 }
             }
-                finally
-                {
-                    // Put it back, even if we fail...
-                    await EnsureMasterSlaveSetupAsync(a);
-                }
-            }
-        }
-
-        protected async Task EnsureMasterSlaveSetupAsync(ConnectionMultiplexer mutex)
-        {
-            var shouldBeMaster = mutex.GetServer(TestConfig.Current.FailoverMasterServerAndPort);
-            if (shouldBeMaster.IsSlave)
-            {
-                Output.WriteLine(shouldBeMaster.EndPoint + " should be master, fixing...");
-                shouldBeMaster.MakeMaster(ReplicationChangeOptions.SetTiebreaker);
-            }
-
-            Output.WriteLine("Flushing all databases...");
-            shouldBeMaster.FlushAllDatabases(CommandFlags.FireAndForget);
-
-            var shouldBeReplica = mutex.GetServer(TestConfig.Current.FailoverSlaveServerAndPort);
-            if (!shouldBeReplica.IsSlave)
-            {
-                Output.WriteLine(shouldBeReplica.EndPoint + " should be a slave, fixing...");
-                shouldBeReplica.SlaveOf(shouldBeMaster.EndPoint);
-                await Task.Delay(1000).ForAwait();
-            }
         }
     }
 }