Update hiredis test suite

Author: byroot

Gemfile

@@ -8,5 +8,7 @@ gem 'minitest'
 gem 'rake'
 gem 'rubocop', '~> 1.25.1'
 gem 'mocha'
-gem 'redis-client', github: 'redis-rb/redis-client' # RESP2 supportnot yet released
-gem 'hiredis-client', github: 'redis-rb/redis-client' # RESP2 supportnot yet released
+
+# RESP2 supportnot yet released
+gem 'redis-client', github: 'redis-rb/redis-client'
+gem 'hiredis-client', github: 'redis-rb/redis-client'

lib/redis/client.rb

@@ -13,7 +13,7 @@ class Client < ::RedisClient
       RedisClient::FailoverError => Redis::CannotConnectError,
       RedisClient::PermissionError => Redis::PermissionError,
       RedisClient::WrongTypeError => Redis::WrongTypeError,
-      RedisClient::RESP3::UnknownType => Redis::ProtocolError,
+      RedisClient::ProtocolError => Redis::ProtocolError,
     }.freeze
 
     class << self

test/redis/ssl_test.rb

@@ -5,55 +5,42 @@
 class SslTest < Minitest::Test
   include Helper::Client
 
-  driver(:ruby) do
-    def test_connection_to_non_ssl_server
-      assert_raises(Redis::CannotConnectError) do
-        redis = Redis.new(OPTIONS.merge(ssl: true, timeout: LOW_TIMEOUT))
-        redis.ping
-      end
-    end
-
-    def test_verified_ssl_connection
-      RedisMock.start({ ping: proc { "+PONG" } }, ssl_server_opts("trusted")) do |port|
-        redis = Redis.new(host: "127.0.0.1", port: port, ssl: true, ssl_params: { ca_file: ssl_ca_file })
-        assert_equal redis.ping, "PONG"
-      end
+  def test_connection_to_non_ssl_server
+    assert_raises(Redis::CannotConnectError) do
+      redis = Redis.new(OPTIONS.merge(ssl: true, timeout: LOW_TIMEOUT))
+      redis.ping
     end
+  end
 
-    def test_unverified_ssl_connection
-      assert_raises(Redis::CannotConnectError) do
-        RedisMock.start({ ping: proc { "+PONG" } }, ssl_server_opts("untrusted")) do |port|
-          redis = Redis.new(port: port, ssl: true, ssl_params: { ca_file: ssl_ca_file })
-          redis.ping
-        end
-      end
+  def test_verified_ssl_connection
+    RedisMock.start({ ping: proc { "+PONG" } }, ssl_server_opts("trusted")) do |port|
+      redis = Redis.new(host: "127.0.0.1", port: port, ssl: true, ssl_params: { ca_file: ssl_ca_file })
+      assert_equal redis.ping, "PONG"
     end
+  end
 
-    def test_verify_certificates_by_default
-      assert_raises(Redis::CannotConnectError) do
-        RedisMock.start({ ping: proc { "+PONG" } }, ssl_server_opts("untrusted")) do |port|
-          redis = Redis.new(port: port, ssl: true)
-          redis.ping
-        end
+  def test_unverified_ssl_connection
+    assert_raises(Redis::CannotConnectError) do
+      RedisMock.start({ ping: proc { "+PONG" } }, ssl_server_opts("untrusted")) do |port|
+        redis = Redis.new(port: port, ssl: true, ssl_params: { ca_file: ssl_ca_file })
+        redis.ping
       end
     end
+  end
 
-    def test_ssl_blocking
-      RedisMock.start({}, ssl_server_opts("trusted")) do |port|
-        redis = Redis.new(host: "127.0.0.1", port: port, ssl: true, ssl_params: { ca_file: ssl_ca_file })
-        assert_equal redis.set("boom", "a" * 10_000_000), "OK"
+  def test_verify_certificates_by_default
+    assert_raises(Redis::CannotConnectError) do
+      RedisMock.start({ ping: proc { "+PONG" } }, ssl_server_opts("untrusted")) do |port|
+        redis = Redis.new(port: port, ssl: true)
+        redis.ping
       end
     end
   end
 
-  driver(:hiredis) do
-    def test_ssl_not_implemented_exception
-      assert_raises(NotImplementedError) do
-        RedisMock.start({ ping: proc { "+PONG" } }, ssl_server_opts("trusted")) do |port|
-          redis = Redis.new(port: port, ssl: true, ssl_params: { ca_file: ssl_ca_file })
-          redis.ping
-        end
-      end
+  def test_ssl_blocking
+    RedisMock.start({}, ssl_server_opts("trusted")) do |port|
+      redis = Redis.new(host: "127.0.0.1", port: port, ssl: true, ssl_params: { ca_file: ssl_ca_file })
+      assert_equal redis.set("boom", "a" * 10_000_000), "OK"
     end
   end