Update sentinel tests to account for the password being preserved

casperisfine · Aug 9, 2023 · effadaa · effadaa
1 parent af70deb
commit effadaa
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/test/sentinel/sentinel_test.rb b/test/sentinel/sentinel_test.rb
@@ -197,7 +197,7 @@ def test_sentinel_with_non_sentinel_options
       end
     end
 
-    assert_equal [%w[get-master-addr-by-name master1], ["sentinels", "master1"]], commands[:s1]
+    assert_equal [%w[auth foo], %w[get-master-addr-by-name master1], ["sentinels", "master1"]], commands[:s1]
     assert_equal [%w[auth foo], %w[role]], commands[:m1]
   end
 
@@ -409,12 +409,15 @@ def test_sentinel_retries
 
     connections = []
 
+    fails = Hash.new(0)
+
     handler = lambda do |id, port|
       {
         sentinel: lambda do |command, *_args|
           connections << id
 
-          if connections.count(id) < 2
+          if fails[id] < 2
+            fails[id] += 1
             :close
           else
             case command
@@ -451,9 +454,10 @@ def test_sentinel_retries
       end
     end
 
-    assert_equal %i[s1 s2 s1 s1], connections
+    assert_equal %i[s1 s1 s2 s2 s1 s1], connections
 
     connections.clear
+    fails.clear
 
     ex = assert_raises(Redis::CannotConnectError) do
       RedisMock.start(master) do |master_port|