redis 3.3.5 → 4.0.0

data/test/blocking_commands_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/blocking_commands"
+require_relative "helper"
+require_relative "lint/blocking_commands"
 
 class TestBlockingCommands < Test::Unit::TestCase
 
@@ -17,7 +15,7 @@ class TestBlockingCommands < Test::Unit::TestCase
       yield(r)
       t2 = Time.now
 
-      assert timeout == r.client.timeout
+      assert timeout == r._client.timeout
       assert delay <= (t2 - t1)
     end
   end

data/test/client_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestClient < Test::Unit::TestCase
 

data/test/command_map_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestCommandMap < Test::Unit::TestCase
 
@@ -11,7 +9,7 @@ class TestCommandMap < Test::Unit::TestCase
 
     assert_equal 2, r.incr("counter")
 
-    r.client.command_map[:incr] = :decr
+    r._client.command_map[:incr] = :decr
 
     assert_equal 1, r.incr("counter")
   end
@@ -23,7 +21,7 @@ class TestCommandMap < Test::Unit::TestCase
       r.idontexist("key")
     end
 
-    r.client.command_map[:idontexist] = :get
+    r._client.command_map[:idontexist] = :get
 
     assert_equal "value", r.idontexist("key")
   end

data/test/commands_on_hashes_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hashes"
+require_relative "helper"
+require_relative "lint/hashes"
 
 class TestCommandsOnHashes < Test::Unit::TestCase
 

data/test/commands_on_hyper_log_log_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hyper_log_log"
+require_relative "helper"
+require_relative "lint/hyper_log_log"
 
 class TestCommandsOnHyperLogLog < Test::Unit::TestCase
 
@@ -18,4 +16,4 @@ class TestCommandsOnHyperLogLog < Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/commands_on_lists_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/lists"
+require_relative "helper"
+require_relative "lint/lists"
 
 class TestCommandsOnLists < Test::Unit::TestCase
 

data/test/commands_on_sets_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sets"
+require_relative "helper"
+require_relative "lint/sets"
 
 class TestCommandsOnSets < Test::Unit::TestCase
 

data/test/commands_on_sorted_sets_test.rb

@@ -1,13 +1,26 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sorted_sets"
+require_relative "helper"
+require_relative "lint/sorted_sets"
 
 class TestCommandsOnSortedSets < Test::Unit::TestCase
 
   include Helper::Client
   include Lint::SortedSets
 
+  def test_zlexcount
+    target_version "2.8.9" do
+      r.zadd "foo", 0, "aaren"
+      r.zadd "foo", 0, "abagael"
+      r.zadd "foo", 0, "abby"
+      r.zadd "foo", 0, "abbygail"
+
+      assert_equal 4, r.zlexcount("foo", "[a", "[a\xff")
+      assert_equal 4, r.zlexcount("foo", "[aa", "[ab\xff")
+      assert_equal 3, r.zlexcount("foo", "(aaren", "[ab\xff")
+      assert_equal 2, r.zlexcount("foo", "[aba", "(abbygail")
+      assert_equal 1, r.zlexcount("foo", "(aaren", "(abby")
+    end
+  end
+
   def test_zrangebylex
     target_version "2.8.9" do
       r.zadd "foo", 0, "aaren"

data/test/commands_on_strings_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/strings"
+require_relative "helper"
+require_relative "lint/strings"
 
 class TestCommandsOnStrings < Test::Unit::TestCase
 
@@ -82,7 +80,7 @@ class TestCommandsOnStrings < Test::Unit::TestCase
   end
 
   def test_bitop
-    try_encoding("UTF-8") do
+    with_external_encoding("UTF-8") do
       target_version "2.5.10" do
         r.set("foo", "a")
         r.set("bar", "b")

data/test/commands_on_value_types_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/value_types"
+require_relative "helper"
+require_relative "lint/value_types"
 
 class TestCommandsOnValueTypes < Test::Unit::TestCase
 
@@ -111,8 +109,8 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
       end
       assert ex.message =~ /port not specified/
 
-      default_db = redis.client.db.to_i
-      default_timeout = redis.client.timeout.to_i
+      default_db = redis._client.db.to_i
+      default_timeout = redis._client.timeout.to_i
 
       # Test defaults
       actual = redis.migrate("foo", options)

data/test/connection_handling_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestConnectionHandling < Test::Unit::TestCase
 
@@ -40,7 +38,7 @@ class TestConnectionHandling < Test::Unit::TestCase
     r.select 14
     assert_equal nil, r.get("foo")
 
-    r.client.disconnect
+    r._client.disconnect
 
     assert_equal nil, r.get("foo")
   end
@@ -48,7 +46,7 @@ class TestConnectionHandling < Test::Unit::TestCase
   def test_quit
     r.quit
 
-    assert !r.client.connected?
+    assert !r._client.connected?
   end
 
   def test_close
@@ -148,7 +146,7 @@ class TestConnectionHandling < Test::Unit::TestCase
       end
 
       assert_equal nil, result
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end
 
@@ -188,7 +186,7 @@ class TestConnectionHandling < Test::Unit::TestCase
       end
 
       assert_equal nil, result
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end
 

data/test/distributed_blocking_commands_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/blocking_commands"
+require_relative "helper"
+require_relative "lint/blocking_commands"
 
 class TestDistributedBlockingCommands < Test::Unit::TestCase
 

data/test/distributed_commands_on_hashes_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hashes"
+require_relative "helper"
+require_relative "lint/hashes"
 
 class TestDistributedCommandsOnHashes < Test::Unit::TestCase
 

data/test/distributed_commands_on_hyper_log_log_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hyper_log_log"
+require_relative "helper"
+require_relative "lint/hyper_log_log"
 
 class TestDistributedCommandsOnHyperLogLog < Test::Unit::TestCase
 

data/test/distributed_commands_on_lists_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/lists"
+require_relative "helper"
+require_relative "lint/lists"
 
 class TestDistributedCommandsOnLists < Test::Unit::TestCase
 

data/test/distributed_commands_on_sets_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sets"
+require_relative "helper"
+require_relative "lint/sets"
 
 class TestDistributedCommandsOnSets < Test::Unit::TestCase
 

data/test/distributed_commands_on_sorted_sets_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sorted_sets"
+require_relative "helper"
+require_relative "lint/sorted_sets"
 
 class TestDistributedCommandsOnSortedSets < Test::Unit::TestCase
 

data/test/distributed_commands_on_strings_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/strings"
+require_relative "helper"
+require_relative "lint/strings"
 
 class TestDistributedCommandsOnStrings < Test::Unit::TestCase
 

data/test/distributed_commands_on_value_types_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/value_types"
+require_relative "helper"
+require_relative "lint/value_types"
 
 class TestDistributedCommandsOnValueTypes < Test::Unit::TestCase
 

data/test/distributed_commands_requiring_clustering_test.rb

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

data/test/distributed_connection_handling_test.rb

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

data/test/distributed_internals_test.rb

@@ -1,41 +1,39 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedInternals < Test::Unit::TestCase
 
   include Helper::Distributed
 
   def test_provides_a_meaningful_inspect
-    nodes = ["redis://localhost:#{PORT}/15", *NODES]
+    nodes = ["redis://127.0.0.1:#{PORT}/15", *NODES]
     redis = Redis::Distributed.new nodes
 
     assert_equal "#<Redis client v#{Redis::VERSION} for #{redis.nodes.map(&:id).join(', ')}>", redis.inspect
   end
 
   def test_default_as_urls
-    nodes = ["redis://localhost:#{PORT}/15", *NODES]
+    nodes = ["redis://127.0.0.1:#{PORT}/15", *NODES]
     redis = Redis::Distributed.new nodes
-    assert_equal ["redis://localhost:#{PORT}/15", *NODES], redis.nodes.map { |node| node.client.id}
+    assert_equal ["redis://127.0.0.1:#{PORT}/15", *NODES], redis.nodes.map { |node| node._client.id }
   end
 
   def test_default_as_config_hashes
     nodes = [OPTIONS.merge(:host => '127.0.0.1'), OPTIONS.merge(:host => 'somehost', :port => PORT.next)]
     redis = Redis::Distributed.new nodes
-    assert_equal ["redis://127.0.0.1:#{PORT}/15","redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node.client.id }
+    assert_equal ["redis://127.0.0.1:#{PORT}/15","redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node._client.id }
   end
 
   def test_as_mix_and_match
     nodes = ["redis://127.0.0.1:7389/15", OPTIONS.merge(:host => 'somehost'), OPTIONS.merge(:host => 'somehost', :port => PORT.next)]
     redis = Redis::Distributed.new nodes
-    assert_equal ["redis://127.0.0.1:7389/15", "redis://somehost:#{PORT}/15", "redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node.client.id }
+    assert_equal ["redis://127.0.0.1:7389/15", "redis://somehost:#{PORT}/15", "redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node._client.id }
   end
 
   def test_override_id
     nodes = [OPTIONS.merge(:host => '127.0.0.1', :id => "test"), OPTIONS.merge( :host => 'somehost', :port => PORT.next, :id => "test1")]
     redis = Redis::Distributed.new nodes
-    assert_equal redis.nodes.first.client.id, "test"
-    assert_equal redis.nodes.last.client.id,  "test1"
+    assert_equal redis.nodes.first._client.id, "test"
+    assert_equal redis.nodes.last._client.id,  "test1"
     assert_equal "#<Redis client v#{Redis::VERSION} for #{redis.nodes.map(&:id).join(', ')}>", redis.inspect
   end
 
@@ -67,13 +65,4 @@ class TestDistributedInternals < Test::Unit::TestCase
 
     assert_equal [], r2.sinter("baz:foo", "baz:bar")
   end
-
-  def test_colliding_node_ids
-    nodes = ["redis://localhost:#{PORT}/15", "redis://localhost:#{PORT}/15", *NODES]
-
-    assert_raise(RuntimeError) do
-      Redis::Distributed.new nodes
-    end
-  end
-
 end

data/test/distributed_key_tags_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedKeyTags < Test::Unit::TestCase
 
@@ -8,9 +6,9 @@ class TestDistributedKeyTags < Test::Unit::TestCase
   include Helper::Distributed
 
   def test_hashes_consistently
-    r1 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
-    r2 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
-    r3 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
+    r1 = Redis::Distributed.new ["redis://127.0.0.1:#{PORT}/15", *NODES]
+    r2 = Redis::Distributed.new ["redis://127.0.0.1:#{PORT}/15", *NODES]
+    r3 = Redis::Distributed.new ["redis://127.0.0.1:#{PORT}/15", *NODES]
 
     assert_equal r1.node_for("foo").id, r2.node_for("foo").id
     assert_equal r1.node_for("foo").id, r3.node_for("foo").id

data/test/distributed_persistence_control_commands_test.rb

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

data/test/distributed_publish_subscribe_test.rb

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

data/test/distributed_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 TestDistributedRemoteServerControlCommands < Test::Unit::TestCase
 

data/test/distributed_scripting_test.rb

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