redis 3.0.5 → 3.0.6

data/test/distributed_sorting_test.rb

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

data/test/distributed_test.rb

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

data/test/distributed_transactions_test.rb

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

data/test/encoding_test.rb

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

data/test/error_replies_test.rb

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

data/test/helper.rb

@@ -1,4 +1,5 @@
-$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+$:.unshift File.expand_path("../lib", File.dirname(__FILE__))
+$:.unshift File.expand_path(File.dirname(__FILE__))
 
 require "test/unit"
 require "logger"
@@ -153,6 +154,14 @@ module Helper
     def assert_in_range(range, value)
       assert range.include?(value), "expected #{value} to be in #{range.inspect}"
     end
+
+    def target_version(target)
+      if version < target
+        skip("Requires Redis > #{target}") if respond_to?(:skip)
+      else
+        yield
+      end
+    end
   end
 
   module Client

data/test/helper_test.rb

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

data/test/internals_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require "helper"
+require File.expand_path("helper", File.dirname(__FILE__))
 
 class TestInternals < Test::Unit::TestCase
 
@@ -109,6 +109,17 @@ class TestInternals < Test::Unit::TestCase
     end
   end
 
+  def test_id_inside_multi
+    redis = Redis.new(OPTIONS)
+    id = nil
+
+    redis.multi do
+      id = redis.id
+    end
+
+    assert_equal id, "redis://127.0.0.1:6381/15"
+  end
+
   driver(:ruby) do
     def test_tcp_keepalive
       keepalive = {:time => 20, :intvl => 10, :probes => 5}
@@ -128,16 +139,16 @@ class TestInternals < Test::Unit::TestCase
   end
 
   def test_time
-    return if version < "2.5.4"
-
-    # Test that the difference between the time that Ruby reports and the time
-    # that Redis reports is minimal (prevents the test from being racy).
-    rv = r.time
+    target_version "2.5.4" do
+      # Test that the difference between the time that Ruby reports and the time
+      # that Redis reports is minimal (prevents the test from being racy).
+      rv = r.time
 
-    redis_usec = rv[0] * 1_000_000 + rv[1]
-    ruby_usec = Integer(Time.now.to_f * 1_000_000)
+      redis_usec = rv[0] * 1_000_000 + rv[1]
+      ruby_usec = Integer(Time.now.to_f * 1_000_000)
 
-    assert 500_000 > (ruby_usec - redis_usec).abs
+      assert 500_000 > (ruby_usec - redis_usec).abs
+    end
   end
 
   def test_connection_timeout

data/test/lint/hashes.rb

@@ -31,18 +31,18 @@ module Lint
     end
 
     def test_variadic_hdel
-      return if version < "2.3.9"
+      target_version "2.3.9" do
+        r.hset("foo", "f1", "s1")
+        r.hset("foo", "f2", "s2")
 
-      r.hset("foo", "f1", "s1")
-      r.hset("foo", "f2", "s2")
-
-      assert_equal "s1", r.hget("foo", "f1")
-      assert_equal "s2", r.hget("foo", "f2")
+        assert_equal "s1", r.hget("foo", "f1")
+        assert_equal "s2", r.hget("foo", "f2")
 
-      assert_equal 2, r.hdel("foo", ["f1", "f2"])
+        assert_equal 2, r.hdel("foo", ["f1", "f2"])
 
-      assert_equal nil, r.hget("foo", "f1")
-      assert_equal nil, r.hget("foo", "f2")
+        assert_equal nil, r.hget("foo", "f1")
+        assert_equal nil, r.hget("foo", "f2")
+      end
     end
 
     def test_hexists
@@ -144,19 +144,19 @@ module Lint
     end
 
     def test_hincrbyfloat
-      return if version < "2.5.4"
+      target_version "2.5.4" do
+        r.hincrbyfloat("foo", "f1", 1.23)
 
-      r.hincrbyfloat("foo", "f1", 1.23)
+        assert_equal "1.23", r.hget("foo", "f1")
 
-      assert_equal "1.23", r.hget("foo", "f1")
+        r.hincrbyfloat("foo", "f1", 0.77)
 
-      r.hincrbyfloat("foo", "f1", 0.77)
+        assert_equal "2", r.hget("foo", "f1")
 
-      assert_equal "2", r.hget("foo", "f1")
+        r.hincrbyfloat("foo", "f1", -0.1)
 
-      r.hincrbyfloat("foo", "f1", -0.1)
-
-      assert_equal "1.9", r.hget("foo", "f1")
+        assert_equal "1.9", r.hget("foo", "f1")
+      end
     end
   end
 end

data/test/lint/lists.rb

@@ -11,11 +11,11 @@ module Lint
     end
 
     def test_variadic_lpush
-      return if version < "2.3.9" # 2.4-rc6
-
-      assert_equal 3, r.lpush("foo", ["s1", "s2", "s3"])
-      assert_equal 3, r.llen("foo")
-      assert_equal "s3", r.lpop("foo")
+      target_version "2.3.9" do # 2.4-rc6
+        assert_equal 3, r.lpush("foo", ["s1", "s2", "s3"])
+        assert_equal 3, r.llen("foo")
+        assert_equal "s3", r.lpop("foo")
+      end
     end
 
     def test_lpushx
@@ -36,11 +36,11 @@ module Lint
     end
 
     def test_variadic_rpush
-      return if version < "2.3.9" # 2.4-rc6
-
-      assert_equal 3, r.rpush("foo", ["s1", "s2", "s3"])
-      assert_equal 3, r.llen("foo")
-      assert_equal "s3", r.rpop("foo")
+      target_version "2.3.9" do # 2.4-rc6
+        assert_equal 3, r.rpush("foo", ["s1", "s2", "s3"])
+        assert_equal 3, r.llen("foo")
+        assert_equal "s3", r.rpop("foo")
+      end
     end
 
     def test_rpushx

data/test/lint/sets.rb

@@ -11,12 +11,12 @@ module Lint
     end
 
     def test_variadic_sadd
-      return if version < "2.3.9" # 2.4-rc6
+      target_version "2.3.9" do # 2.4-rc6
+        assert_equal 2, r.sadd("foo", ["s1", "s2"])
+        assert_equal 1, r.sadd("foo", ["s1", "s2", "s3"])
 
-      assert_equal 2, r.sadd("foo", ["s1", "s2"])
-      assert_equal 1, r.sadd("foo", ["s1", "s2", "s3"])
-
-      assert_equal ["s1", "s2", "s3"], r.smembers("foo").sort
+        assert_equal ["s1", "s2", "s3"], r.smembers("foo").sort
+      end
     end
 
     def test_srem
@@ -30,17 +30,17 @@ module Lint
     end
 
     def test_variadic_srem
-      return if version < "2.3.9" # 2.4-rc6
+      target_version "2.3.9" do # 2.4-rc6
+        r.sadd("foo", "s1")
+        r.sadd("foo", "s2")
+        r.sadd("foo", "s3")
 
-      r.sadd("foo", "s1")
-      r.sadd("foo", "s2")
-      r.sadd("foo", "s3")
+        assert_equal 1, r.srem("foo", ["s1", "aaa"])
+        assert_equal 0, r.srem("foo", ["bbb", "ccc" "ddd"])
+        assert_equal 1, r.srem("foo", ["eee", "s3"])
 
-      assert_equal 1, r.srem("foo", ["s1", "aaa"])
-      assert_equal 0, r.srem("foo", ["bbb", "ccc" "ddd"])
-      assert_equal 1, r.srem("foo", ["eee", "s3"])
-
-      assert_equal ["s2"], r.smembers("foo")
+        assert_equal ["s2"], r.smembers("foo")
+      end
     end
 
     def test_spop

data/test/lint/sorted_sets.rb

@@ -12,25 +12,25 @@ module Lint
     end
 
     def test_variadic_zadd
-      return if version < "2.3.9" # 2.4-rc6
-
-      # Non-nested array with pairs
-      assert_equal 0, r.zcard("foo")
-      assert_equal 2, r.zadd("foo", [1, "s1", 2, "s2"])
-      assert_equal 1, r.zadd("foo", [4, "s1", 5, "s2", 6, "s3"])
-      assert_equal 3, r.zcard("foo")
-      r.del "foo"
-
-      # Nested array with pairs
-      assert_equal 0, r.zcard("foo")
-      assert_equal 2, r.zadd("foo", [[1, "s1"], [2, "s2"]])
-      assert_equal 1, r.zadd("foo", [[4, "s1"], [5, "s2"], [6, "s3"]])
-      assert_equal 3, r.zcard("foo")
-      r.del "foo"
-
-      # Wrong number of arguments
-      assert_raise(Redis::CommandError) { r.zadd("foo", ["bar"]) }
-      assert_raise(Redis::CommandError) { r.zadd("foo", ["bar", "qux", "zap"]) }
+      target_version "2.3.9" do # 2.4-rc6
+        # Non-nested array with pairs
+        assert_equal 0, r.zcard("foo")
+        assert_equal 2, r.zadd("foo", [1, "s1", 2, "s2"])
+        assert_equal 1, r.zadd("foo", [4, "s1", 5, "s2", 6, "s3"])
+        assert_equal 3, r.zcard("foo")
+        r.del "foo"
+
+        # Nested array with pairs
+        assert_equal 0, r.zcard("foo")
+        assert_equal 2, r.zadd("foo", [[1, "s1"], [2, "s2"]])
+        assert_equal 1, r.zadd("foo", [[4, "s1"], [5, "s2"], [6, "s3"]])
+        assert_equal 3, r.zcard("foo")
+        r.del "foo"
+
+        # Wrong number of arguments
+        assert_raise(Redis::CommandError) { r.zadd("foo", ["bar"]) }
+        assert_raise(Redis::CommandError) { r.zadd("foo", ["bar", "qux", "zap"]) }
+      end
     end
 
     def test_zrem
@@ -44,17 +44,17 @@ module Lint
     end
 
     def test_variadic_zrem
-      return if version < "2.3.9" # 2.4-rc6
-
-      r.zadd("foo", 1, "s1")
-      r.zadd("foo", 2, "s2")
-      r.zadd("foo", 3, "s3")
-
-      assert_equal 3, r.zcard("foo")
-      assert_equal 1, r.zrem("foo", ["s1", "aaa"])
-      assert_equal 0, r.zrem("foo", ["bbb", "ccc" "ddd"])
-      assert_equal 1, r.zrem("foo", ["eee", "s3"])
-      assert_equal 1, r.zcard("foo")
+      target_version "2.3.9" do # 2.4-rc6
+        r.zadd("foo", 1, "s1")
+        r.zadd("foo", 2, "s2")
+        r.zadd("foo", 3, "s3")
+
+        assert_equal 3, r.zcard("foo")
+        assert_equal 1, r.zrem("foo", ["s1", "aaa"])
+        assert_equal 0, r.zrem("foo", ["bbb", "ccc" "ddd"])
+        assert_equal 1, r.zrem("foo", ["eee", "s3"])
+        assert_equal 1, r.zcard("foo")
+      end
     end
 
     def test_zincrby

data/test/lint/strings.rb

@@ -48,40 +48,40 @@ module Lint
     end
 
     def test_set_with_ex
-      return if version < "2.6.12"
-
-      r.set("foo", "bar", :ex => 2)
-      assert_in_range 0..2, r.ttl("foo")
+      target_version "2.6.12" do
+        r.set("foo", "bar", :ex => 2)
+        assert_in_range 0..2, r.ttl("foo")
+      end
     end
 
     def test_set_with_px
-      return if version < "2.6.12"
-
-      r.set("foo", "bar", :px => 2000)
-      assert_in_range 0..2, r.ttl("foo")
+      target_version "2.6.12" do
+        r.set("foo", "bar", :px => 2000)
+        assert_in_range 0..2, r.ttl("foo")
+      end
     end
 
     def test_set_with_nx
-      return if version < "2.6.12"
-
-      r.set("foo", "qux", :nx => true)
-      assert !r.set("foo", "bar", :nx => true)
-      assert_equal "qux", r.get("foo")
-
-      r.del("foo")
-      assert r.set("foo", "bar", :nx => true)
-      assert_equal "bar", r.get("foo")
+      target_version "2.6.12" do
+        r.set("foo", "qux", :nx => true)
+        assert !r.set("foo", "bar", :nx => true)
+        assert_equal "qux", r.get("foo")
+
+        r.del("foo")
+        assert r.set("foo", "bar", :nx => true)
+        assert_equal "bar", r.get("foo")
+      end
     end
 
     def test_set_with_xx
-      return if version < "2.6.12"
+      target_version "2.6.12" do
+        r.set("foo", "qux")
+        assert r.set("foo", "bar", :xx => true)
+        assert_equal "bar", r.get("foo")
 
-      r.set("foo", "qux")
-      assert r.set("foo", "bar", :xx => true)
-      assert_equal "bar", r.get("foo")
-
-      r.del("foo")
-      assert !r.set("foo", "bar", :xx => true)
+        r.del("foo")
+        assert !r.set("foo", "bar", :xx => true)
+      end
     end
 
     def test_setex
@@ -99,21 +99,21 @@ module Lint
     end
 
     def test_psetex
-      return if version < "2.5.4"
-
-      assert r.psetex("foo", 1000, "bar")
-      assert_equal "bar", r.get("foo")
-      assert [0, 1].include? r.ttl("foo")
+      target_version "2.5.4" do
+        assert r.psetex("foo", 1000, "bar")
+        assert_equal "bar", r.get("foo")
+        assert [0, 1].include? r.ttl("foo")
+      end
     end
 
     def test_psetex_with_non_string_value
-      return if version < "2.5.4"
+      target_version "2.5.4" do
+        value = ["b", "a", "r"]
 
-      value = ["b", "a", "r"]
-
-      assert r.psetex("foo", 1000, value)
-      assert_equal value.to_s, r.get("foo")
-      assert [0, 1].include? r.ttl("foo")
+        assert r.psetex("foo", 1000, value)
+        assert_equal value.to_s, r.get("foo")
+        assert [0, 1].include? r.ttl("foo")
+      end
     end
 
     def test_getset
@@ -167,11 +167,11 @@ module Lint
     end
 
     def test_incrbyfloat
-      return if version < "2.5.4"
-
-      assert_equal 1.23, r.incrbyfloat("foo", 1.23)
-      assert_equal 2   , r.incrbyfloat("foo", 0.77)
-      assert_equal 1.9 , r.incrbyfloat("foo", -0.1)
+      target_version "2.5.4" do
+        assert_equal 1.23, r.incrbyfloat("foo", 1.23)
+        assert_equal 2   , r.incrbyfloat("foo", 0.77)
+        assert_equal 1.9 , r.incrbyfloat("foo", -0.1)
+      end
     end
 
     def test_decr
@@ -218,12 +218,12 @@ module Lint
     end
 
     def test_bitcount
-      return if version < "2.5.10"
+      target_version "2.5.10" do
+        r.set("foo", "abcde")
 
-      r.set("foo", "abcde")
-
-      assert_equal 10, r.bitcount("foo", 1, 3)
-      assert_equal 17, r.bitcount("foo", 0, -1)
+        assert_equal 10, r.bitcount("foo", 1, 3)
+        assert_equal 17, r.bitcount("foo", 0, -1)
+      end
     end
 
     def test_getrange