redis 3.3.5 → 4.0.1

data/test/internals_test.rb

@@ -1,11 +1,8 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestInternals < Test::Unit::TestCase
 
   include Helper::Client
-  include Helper::Skipable
 
   def test_logger
     r.ping
@@ -45,23 +42,23 @@ class TestInternals < Test::Unit::TestCase
   end
 
   def test_redis_current
-    assert_equal "127.0.0.1", Redis.current.client.host
-    assert_equal 6379, Redis.current.client.port
-    assert_equal 0, Redis.current.client.db
+    assert_equal "127.0.0.1", Redis.current._client.host
+    assert_equal 6379, Redis.current._client.port
+    assert_equal 0, Redis.current._client.db
 
     Redis.current = Redis.new(OPTIONS.merge(:port => 6380, :db => 1))
 
     t = Thread.new do
-      assert_equal "127.0.0.1", Redis.current.client.host
-      assert_equal 6380, Redis.current.client.port
-      assert_equal 1, Redis.current.client.db
+      assert_equal "127.0.0.1", Redis.current._client.host
+      assert_equal 6380, Redis.current._client.port
+      assert_equal 1, Redis.current._client.db
     end
 
     t.join
 
-    assert_equal "127.0.0.1", Redis.current.client.host
-    assert_equal 6380, Redis.current.client.port
-    assert_equal 1, Redis.current.client.db
+    assert_equal "127.0.0.1", Redis.current._client.host
+    assert_equal 6380, Redis.current._client.port
+    assert_equal 1, Redis.current._client.db
   end
 
   def test_redis_connected?
@@ -88,7 +85,7 @@ class TestInternals < Test::Unit::TestCase
       redis = Redis.new(OPTIONS.merge(:tcp_keepalive => keepalive))
       redis.ping
 
-      connection = redis.client.connection
+      connection = redis._client.connection
       actual_keepalive = connection.get_tcp_keepalive
 
       [:time, :intvl, :probes].each do |key|
@@ -121,22 +118,10 @@ class TestInternals < Test::Unit::TestCase
     assert (Time.now - start_time) <= opts[:timeout]
   end
 
-  driver(:ruby) do
-    def test_write_timeout
-      return skip("Relies on buffer sizes, might be unreliable")
-
-      server = TCPServer.new("127.0.0.1", 0)
-      port   = server.addr[1]
-
-      # Hacky, but we need the buffer size
-      val = TCPSocket.new("127.0.0.1", port).getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).unpack("i")[0]
-
-      assert_raise(Redis::TimeoutError) do
-        Timeout.timeout(1) do
-          redis = Redis.new(:port => port, :timeout => 5, :write_timeout => 0.1)
-          redis.set("foo", "1" * val*2)
-        end
-      end
+  def test_missing_socket
+    opts = { :path => '/missing.sock' }
+    assert_raise Redis::CannotConnectError do
+      Redis.new(opts).ping
     end
   end
 
@@ -197,7 +182,7 @@ class TestInternals < Test::Unit::TestCase
         redis.ping
       end
 
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end
 
@@ -213,7 +198,7 @@ class TestInternals < Test::Unit::TestCase
         redis.ping
       end
 
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end
 
@@ -226,7 +211,7 @@ class TestInternals < Test::Unit::TestCase
         end
       end
 
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end
 
@@ -267,14 +252,14 @@ class TestInternals < Test::Unit::TestCase
 
   def test_retry_on_write_error_by_default
     close_on_connection([0]) do |redis|
-      assert_equal "1", redis.client.call(["x" * 128 * 1024])
+      assert_equal "1", redis._client.call(["x" * 128 * 1024])
     end
   end
 
   def test_retry_on_write_error_when_wrapped_in_with_reconnect_true
     close_on_connection([0]) do |redis|
       redis.with_reconnect(true) do
-        assert_equal "1", redis.client.call(["x" * 128 * 1024])
+        assert_equal "1", redis._client.call(["x" * 128 * 1024])
       end
     end
   end
@@ -283,7 +268,7 @@ class TestInternals < Test::Unit::TestCase
     close_on_connection([0]) do |redis|
       assert_raise Redis::ConnectionError do
         redis.with_reconnect(false) do
-          redis.client.call(["x" * 128 * 1024])
+          redis._client.call(["x" * 128 * 1024])
         end
       end
     end
@@ -293,7 +278,7 @@ class TestInternals < Test::Unit::TestCase
     close_on_connection([0]) do |redis|
       assert_raise Redis::ConnectionError do
         redis.without_reconnect do
-          redis.client.call(["x" * 128 * 1024])
+          redis._client.call(["x" * 128 * 1024])
         end
       end
     end
@@ -301,7 +286,7 @@ class TestInternals < Test::Unit::TestCase
 
   def test_connecting_to_unix_domain_socket
     assert_nothing_raised do
-      Redis.new(OPTIONS.merge(:path => "./test/db/redis.sock")).ping
+      Redis.new(OPTIONS.merge(:path => ENV.fetch("SOCKET_PATH"))).ping
     end
   end
 
@@ -323,23 +308,10 @@ class TestInternals < Test::Unit::TestCase
   def test_client_options
     redis = Redis.new(OPTIONS.merge(:host => "host", :port => 1234, :db => 1, :scheme => "foo"))
 
-    assert_equal "host", redis.client.options[:host]
-    assert_equal 1234, redis.client.options[:port]
-    assert_equal 1, redis.client.options[:db]
-    assert_equal "foo", redis.client.options[:scheme]
-  end
-
-  def test_does_not_change_self_client_options
-    redis = Redis.new(OPTIONS.merge(:host => "host", :port => 1234, :db => 1, :scheme => "foo"))
-    options = redis.client.options
-
-    options[:host] << "new_host"
-    options[:scheme] << "bar"
-    options.merge!(:db => 0)
-
-    assert_equal "host", redis.client.options[:host]
-    assert_equal 1, redis.client.options[:db]
-    assert_equal "foo", redis.client.options[:scheme]
+    assert_equal "host", redis._client.options[:host]
+    assert_equal 1234, redis._client.options[:port]
+    assert_equal 1, redis._client.options[:db]
+    assert_equal "foo", redis._client.options[:scheme]
   end
 
   def test_resolves_localhost

data/test/lint/strings.rb

@@ -8,18 +8,6 @@ module Lint
       assert_equal "s1", r.get("foo")
     end
 
-    def test_set_and_get_with_brackets
-      r["foo"] = "s1"
-
-      assert_equal "s1", r["foo"]
-    end
-
-    def test_set_and_get_with_brackets_and_symbol
-      r[:foo] = "s1"
-
-      assert_equal "s1", r[:foo]
-    end
-
     def test_set_and_get_with_newline_characters
       r.set("foo", "1\n")
 
@@ -35,14 +23,12 @@ module Lint
     end
 
     def test_set_and_get_with_ascii_characters
-      if defined?(Encoding)
-        with_external_encoding("ASCII-8BIT") do
-          (0..255).each do |i|
-            str = "#{i.chr}---#{i.chr}"
-            r.set("foo", str)
-
-            assert_equal str, r.get("foo")
-          end
+      with_external_encoding("ASCII-8BIT") do
+        (0..255).each do |i|
+          str = "#{i.chr}---#{i.chr}"
+          r.set("foo", str)
+
+          assert_equal str, r.get("foo")
         end
       end
     end

data/test/lint/value_types.rb

@@ -93,6 +93,14 @@ module Lint
         assert r.restore("bar", 1000, w)
         assert_equal ["b", "c", "d"], r.lrange("bar", 0, -1)
         assert [0, 1].include? r.ttl("bar")
+
+        r.set("bar", "somethingelse")
+        assert_raises(Redis::CommandError) { r.restore("bar", 1000, w) } # ensure by default replace is false
+        assert_raises(Redis::CommandError) { r.restore("bar", 1000, w, :replace => false) }
+        assert_equal "somethingelse", r.get("bar")
+        assert r.restore("bar", 1000, w, :replace => true)
+        assert_equal ["b", "c", "d"], r.lrange("bar", 0, -1)
+        assert [0, 1].include? r.ttl("bar")
       end
     end
 

data/test/persistence_control_commands_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestPersistenceControlCommands < Test::Unit::TestCase
 

data/test/pipelining_commands_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestPipeliningCommands < Test::Unit::TestCase
 
@@ -136,9 +134,7 @@ class TestPipeliningCommands < Test::Unit::TestCase
     end
 
     assert_equal true, @result.is_a?(Redis::Future)
-    if defined?(::BasicObject)
-      assert_equal true, @result.is_a?(::BasicObject)
-    end
+    assert_equal true, @result.is_a?(::BasicObject)
     assert_equal Redis::Future, @result.class
   end
 
@@ -225,7 +221,7 @@ class TestPipeliningCommands < Test::Unit::TestCase
       p2.select 2
     end
 
-    assert_equal 2, r.client.db
+    assert_equal 2, r._client.db
   end
 
   def test_nested_pipeline_select_client_db
@@ -237,6 +233,6 @@ class TestPipeliningCommands < Test::Unit::TestCase
       end
     end
 
-    assert_equal 3, r.client.db
+    assert_equal 3, r._client.db
   end
 end

data/test/publish_subscribe_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestPublishSubscribe < Test::Unit::TestCase
 

data/test/remote_server_control_commands_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestRemoteServerControlCommands < Test::Unit::TestCase
 
@@ -115,4 +113,63 @@ class TestRemoteServerControlCommands < Test::Unit::TestCase
     result = r.slowlog(:len)
     assert_equal 0, result
   end
+
+  def test_client
+    assert_equal r.instance_variable_get(:@client), r._client
+  end
+
+  def test_client_list
+    return if version < "2.4.0"
+
+    keys = [
+     "addr",
+     "fd",
+     "name",
+     "age",
+     "idle",
+     "flags",
+     "db",
+     "sub",
+     "psub",
+     "multi",
+     "qbuf",
+     "qbuf-free",
+     "obl",
+     "oll",
+     "omem",
+     "events",
+     "cmd"
+    ]
+
+    clients = r.client(:list)
+    clients.each do |client|
+      keys.each do |k|
+        msg = "expected #client(:list) to include #{k}"
+        assert client.keys.include?(k), msg
+      end
+    end
+  end
+
+  def test_client_kill
+    return if version < "2.6.9"
+
+    r.client(:setname, 'redis-rb')
+    clients = r.client(:list)
+    i = clients.index {|client| client['name'] == 'redis-rb'}
+    assert_equal "OK", r.client(:kill, clients[i]["addr"])
+
+    clients = r.client(:list)
+    i = clients.index {|client| client['name'] == 'redis-rb'}
+    assert_equal nil, i
+  end
+
+  def test_client_getname_and_setname
+    return if version < "2.6.9"
+
+    assert_equal nil, r.client(:getname)
+
+    r.client(:setname, 'redis-rb')
+    name = r.client(:getname)
+    assert_equal 'redis-rb', name
+  end
 end

data/test/scanning_test.rb

@@ -1,10 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-
-unless defined?(Enumerator)
-  Enumerator = Enumerable::Enumerator
-end
+require_relative "helper"
 
 class TestScanning < Test::Unit::TestCase
 

data/test/scripting_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestScripting < Test::Unit::TestCase
 

data/test/sentinel_command_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class SentinelCommandsTest < Test::Unit::TestCase
 

data/test/sentinel_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class SentinelTest < Test::Unit::TestCase
 

data/test/sorting_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestSorting < Test::Unit::TestCase
 

data/test/ssl_test.rb

@@ -1,73 +1,69 @@
-# encoding: UTF-8
+require_relative "helper"
 
-if RUBY_VERSION >= "1.9.3"
-  require File.expand_path("helper", File.dirname(__FILE__))
+class SslTest < Test::Unit::TestCase
 
-  class SslTest < Test::Unit::TestCase
+  include Helper::Client
 
-    include Helper::Client
+  driver(:ruby) do
 
-    driver(:ruby) do
-
-      def test_verified_ssl_connection
-        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 })
-          assert_equal redis.ping, "PONG"
-        end
-      end
-
-      def test_unverified_ssl_connection
-        assert_raise(OpenSSL::SSL::SSLError) 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(:port => port, :ssl => true, :ssl_params => { :ca_file => ssl_ca_file })
+        assert_equal redis.ping, "PONG"
       end
+    end
 
-      def test_ssl_blocking
-        RedisMock.start({}, ssl_server_opts("trusted")) do |port|
+    def test_unverified_ssl_connection
+      assert_raise(OpenSSL::SSL::SSLError) 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 })
-          assert_equal redis.set("boom", "a" * 10_000_000), "OK"
+          redis.ping
         end
       end
+    end
 
+    def test_ssl_blocking
+      RedisMock.start({}, ssl_server_opts("trusted")) do |port|
+        redis = Redis.new(:port => port, :ssl => true, :ssl_params => { :ca_file => ssl_ca_file })
+        assert_equal redis.set("boom", "a" * 10_000_000), "OK"
+      end
     end
 
-    driver(:hiredis, :synchrony) do
+  end
+
+  driver(:hiredis, :synchrony) do
 
-      def test_ssl_not_implemented_exception
-        assert_raise(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
+    def test_ssl_not_implemented_exception
+      assert_raise(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
-
     end
 
-    private
+  end
+
+  private
 
-    def ssl_server_opts(prefix)
-      ssl_cert = File.join(cert_path, "#{prefix}-cert.crt")
-      ssl_key  = File.join(cert_path, "#{prefix}-cert.key")
+  def ssl_server_opts(prefix)
+    ssl_cert = File.join(cert_path, "#{prefix}-cert.crt")
+    ssl_key  = File.join(cert_path, "#{prefix}-cert.key")
 
-      {
-        :ssl => true,
-        :ssl_params => {
-          :cert => OpenSSL::X509::Certificate.new(File.read(ssl_cert)),
-          :key  => OpenSSL::PKey::RSA.new(File.read(ssl_key))
-        }
+    {
+      :ssl => true,
+      :ssl_params => {
+        :cert => OpenSSL::X509::Certificate.new(File.read(ssl_cert)),
+        :key  => OpenSSL::PKey::RSA.new(File.read(ssl_key))
       }
-    end
+    }
+  end
 
-    def ssl_ca_file
-      File.join(cert_path, "trusted-ca.crt")
-    end
+  def ssl_ca_file
+    File.join(cert_path, "trusted-ca.crt")
+  end
 
-    def cert_path
-      File.expand_path("../support/ssl/", __FILE__)
-    end
+  def cert_path
+    File.expand_path("../support/ssl/", __FILE__)
   end
 end

data/test/support/connection/hiredis.rb

@@ -1 +1 @@
-require "support/wire/thread"
+require_relative "../wire/thread"

data/test/support/connection/ruby.rb

@@ -1 +1 @@
-require "support/wire/thread"
+require_relative "../wire/thread"

data/test/support/connection/synchrony.rb

@@ -1,4 +1,4 @@
-require "support/wire/synchrony"
+require_relative "../wire/synchrony"
 
 module Helper
   def around

data/test/synchrony_driver.rb

@@ -1,13 +1,10 @@
-# encoding: UTF-8
+require "em-synchrony"
+require "em-synchrony/connection_pool"
 
-require 'em-synchrony'
-require 'em-synchrony/connection_pool'
+require_relative "../lib/redis"
+require_relative "../lib/redis/connection/synchrony"
 
-require 'redis'
-require 'redis/connection/synchrony'
-
-
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 PORT    = 6381
 OPTIONS = {:port => PORT, :db => 15}
@@ -55,7 +52,7 @@ EM.synchrony do
   assert_equal "s2", r.lpop("foo")
   assert_equal "s1", r.lpop("foo")
 
-  assert_equal "OK", r.client.call(:quit)
+  assert_equal "OK", r._client.call(:quit)
   assert_equal "PONG", r.ping
 
 

data/test/thread_safety_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestThreadSafety < Test::Unit::TestCase
 

data/test/transactions_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestTransactions < Test::Unit::TestCase
 

data/test/unknown_commands_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestUnknownCommands < Test::Unit::TestCase