SHUTDOWN never receives a reply

Author: pietern

lib/redis.rb

@@ -960,7 +960,7 @@ def quit
   # Synchronously save the dataset to disk and then shut down the server.
   def shutdown
     synchronize do
-      @client.call [:shutdown]
+      @client.call_without_reply [:shutdown]
     end
   end
 

lib/redis/client.rb

@@ -48,6 +48,13 @@ def call(*args)
       reply
     end
 
+    # Assume that this method is called with a single array argument. No
+    # backwards compat here, since it was introduced in 2.2.2.
+    def call_without_reply(command)
+      process([command])
+      nil
+    end
+
     # Starting with 2.2.1, assume that this method is called with a single
     # array argument. Check its size for backwards compat.
     def call_loop(*args)

test/connection_handling_test.rb

@@ -47,7 +47,8 @@
   redis_mock(:shutdown => lambda { "+SHUTDOWN" }) do
     redis = Redis.new(OPTIONS.merge(:port => 6380))
 
-    assert "SHUTDOWN" == redis.shutdown
+    # SHUTDOWN does not reply: test that it does not raise here.
+    assert nil == redis.shutdown
   end
 end