PR feedback

Author: nerdrew

lib/redis_client.rb

@@ -842,7 +842,11 @@ def connect
         end
       end
     end
-  rescue FailoverError, CannotConnectError => error
+  rescue FailoverError => error
+    @raw_connection&.close
+    error._set_config(config)
+    raise error
+  rescue CannotConnectError => error
     error._set_config(config)
     raise error
   rescue ConnectionError => error

test/shared/redis_client_tests.rb

@@ -356,19 +356,21 @@ def test_authentication
     assert_match(/WRONGPASS invalid username-password pair/, error.message)
 
     # Correct password, but user disabled
-    backup.call("ACL", "SETUSER", "AzureDiamond", "<hunter2", ">trolilol", "off")
+    @redis.call("ACL", "DELUSER", "AnotherUser")
+    backup.call("ACL", "SETUSER", "AnotherUser", ">boom", "off")
+    client = new_client(username: "AnotherUser", password: "boom")
     error = assert_raises RedisClient::AuthenticationError do
       client.call_once("PING")
     end
     assert_match(/WRONGPASS invalid username-password pair/, error.message)
 
     # Correct password, user enabled
-    backup.call("ACL", "SETUSER", "AzureDiamond", "on")
+    backup.call("ACL", "SETUSER", "AnotherUser", "on")
     assert_equal "PONG", client.call_once("PING")
     assert_match(/user=AzureDiamond/, client.call("CLIENT", "INFO"))
 
     # Wrong username
-    client = new_client(username: "GreenOpal", password: "trolilol")
+    client = new_client(username: "GreenOpal", password: "boom")
     error = assert_raises RedisClient::AuthenticationError do
       client.call("PING")
     end