Fix slow test cases and resolve #801

Author: supercaracal

lib/redis/client.rb

@@ -277,12 +277,15 @@ def write(command)
 
     def with_socket_timeout(timeout)
       connect unless connected?
+      original = @options[:read_timeout]
 
       begin
         connection.timeout = timeout
+        @options[:read_timeout] = timeout # for reconnection
         yield
       ensure
         connection.timeout = self.timeout if connected?
+        @options[:read_timeout] = original
       end
     end
 

test/publish_subscribe_test.rb

@@ -254,7 +254,7 @@ def test_subscribe_with_timeout
     received = false
 
     assert_raise Redis::TimeoutError do
-      r.subscribe_with_timeout(1, "foo")  do |on|
+      r.subscribe_with_timeout(LOW_TIMEOUT, "foo")  do |on|
         on.message do |channel, message|
           received = true
         end
@@ -268,7 +268,7 @@ def test_psubscribe_with_timeout
     received = false
 
     assert_raise Redis::TimeoutError do
-      r.psubscribe_with_timeout(1, "f*")  do |on|
+      r.psubscribe_with_timeout(LOW_TIMEOUT, "f*")  do |on|
         on.message do |channel, message|
           received = true
         end