Stabilize the sentinel suite

Author: byroot

test/helper.rb

@@ -239,6 +239,20 @@ def build_slave_role_client(options = {})
 
     private
 
+    def wait_for_quorum
+      redis = build_sentinel_client
+      50.times do
+        if redis.sentinel('ckquorum', MASTER_NAME).start_with?('OK 3 usable Sentinels')
+          return
+        else
+          sleep 0.1
+        end
+      rescue
+        sleep 0.1
+      end
+      raise "ckquorum timeout"
+    end
+
     def _format_options(options = {})
       {
         url: "redis://#{MASTER_NAME}",

test/sentinel/sentinel_command_test.rb

@@ -7,6 +7,8 @@ class SentinelCommandsTest < Minitest::Test
   include Helper::Sentinel
 
   def test_sentinel_command_master
+    wait_for_quorum
+
     redis = build_sentinel_client
     result = redis.sentinel('master', MASTER_NAME)
 
@@ -15,6 +17,8 @@ def test_sentinel_command_master
   end
 
   def test_sentinel_command_masters
+    wait_for_quorum
+
     redis = build_sentinel_client
     result = redis.sentinel('masters')
 
@@ -24,6 +28,8 @@ def test_sentinel_command_masters
   end
 
   def test_sentinel_command_slaves
+    wait_for_quorum
+
     redis = build_sentinel_client
     result = redis.sentinel('slaves', MASTER_NAME)
 
@@ -33,6 +39,8 @@ def test_sentinel_command_slaves
   end
 
   def test_sentinel_command_sentinels
+    wait_for_quorum
+
     redis = build_sentinel_client
     result = redis.sentinel('sentinels', MASTER_NAME)
 
@@ -51,9 +59,10 @@ def test_sentinel_command_get_master_by_name
   end
 
   def test_sentinel_command_ckquorum
+    wait_for_quorum
+
     redis = build_sentinel_client
     result = redis.sentinel('ckquorum', MASTER_NAME)
-
     assert_equal result, 'OK 3 usable Sentinels. Quorum and failover authorization can be reached'
   end
 end

test/sentinel/sentinel_test.rb

@@ -6,13 +6,16 @@ class SentinelTest < Minitest::Test
   include Helper::Sentinel
 
   def test_sentinel_master_role_connection
+    wait_for_quorum
+
     actual = redis.role
 
     assert_equal 'master', actual[0]
-    assert_equal SLAVE_PORT, actual[2][0][1]
   end
 
   def test_sentinel_slave_role_connection
+    wait_for_quorum
+
     redis = build_slave_role_client
     actual = redis.role