Allow passing extra opts to #with_test_client

This is needed so we can write shorter timeouts in for some tests which
will otherwise sleep for ~10 seconds waiting for timeouts to elsapse!

Author: KJ Tsanaktsidis

test/redis_client/test_cluster.rb

@@ -541,13 +541,14 @@ def hiredis_used?
     class PrimaryOnly < TestingWrapper
       include Mixin
 
-      def new_test_client(capture_buffer: @captured_commands)
+      def new_test_client(capture_buffer: @captured_commands, **opts)
         config = ::RedisClient::ClusterConfig.new(
           nodes: TEST_NODE_URIS,
           fixed_hostname: TEST_FIXED_HOSTNAME,
           middlewares: [CommandCaptureMiddleware],
           custom: { captured_commands: capture_buffer },
-          **TEST_GENERIC_OPTIONS
+          **TEST_GENERIC_OPTIONS,
+          **opts
         )
         ::RedisClient::Cluster.new(config)
       end
@@ -556,15 +557,16 @@ def new_test_client(capture_buffer: @captured_commands)
     class ScaleReadRandom < TestingWrapper
       include Mixin
 
-      def new_test_client(capture_buffer: @captured_commands)
+      def new_test_client(capture_buffer: @captured_commands, **opts)
         config = ::RedisClient::ClusterConfig.new(
           nodes: TEST_NODE_URIS,
           replica: true,
           replica_affinity: :random,
           fixed_hostname: TEST_FIXED_HOSTNAME,
           middlewares: [CommandCaptureMiddleware],
           custom: { captured_commands: capture_buffer },
-          **TEST_GENERIC_OPTIONS
+          **TEST_GENERIC_OPTIONS,
+          **opts
         )
         ::RedisClient::Cluster.new(config)
       end
@@ -573,15 +575,16 @@ def new_test_client(capture_buffer: @captured_commands)
     class ScaleReadRandomWithPrimary < TestingWrapper
       include Mixin
 
-      def new_test_client(capture_buffer: @captured_commands)
+      def new_test_client(capture_buffer: @captured_commands, **opts)
         config = ::RedisClient::ClusterConfig.new(
           nodes: TEST_NODE_URIS,
           replica: true,
           replica_affinity: :random_with_primary,
           fixed_hostname: TEST_FIXED_HOSTNAME,
           middlewares: [CommandCaptureMiddleware],
           custom: { captured_commands: capture_buffer },
-          **TEST_GENERIC_OPTIONS
+          **TEST_GENERIC_OPTIONS,
+          **opts
         )
         ::RedisClient::Cluster.new(config)
       end
@@ -590,15 +593,16 @@ def new_test_client(capture_buffer: @captured_commands)
     class ScaleReadLatency < TestingWrapper
       include Mixin
 
-      def new_test_client(capture_buffer: @captured_commands)
+      def new_test_client(capture_buffer: @captured_commands, **opts)
         config = ::RedisClient::ClusterConfig.new(
           nodes: TEST_NODE_URIS,
           replica: true,
           replica_affinity: :latency,
           fixed_hostname: TEST_FIXED_HOSTNAME,
           middlewares: [CommandCaptureMiddleware],
           custom: { captured_commands: capture_buffer },
-          **TEST_GENERIC_OPTIONS
+          **TEST_GENERIC_OPTIONS,
+          **opts
         )
         ::RedisClient::Cluster.new(config)
       end
@@ -607,13 +611,14 @@ def new_test_client(capture_buffer: @captured_commands)
     class Pooled < TestingWrapper
       include Mixin
 
-      def new_test_client(capture_buffer: @captured_commands)
+      def new_test_client(capture_buffer: @captured_commands, **opts)
         config = ::RedisClient::ClusterConfig.new(
           nodes: TEST_NODE_URIS,
           fixed_hostname: TEST_FIXED_HOSTNAME,
           middlewares: [CommandCaptureMiddleware],
           custom: { captured_commands: capture_buffer },
-          **TEST_GENERIC_OPTIONS
+          **TEST_GENERIC_OPTIONS,
+          **opts
         )
         ::RedisClient::Cluster.new(config, pool: { timeout: TEST_TIMEOUT_SEC, size: 2 })
       end