Explicitly skip tests that don't match the Redis version.

Author: djanowski

test/commands_on_strings_test.rb

@@ -82,7 +82,7 @@ def test_msetnx_mapped
   end
 
   def test_bitop
-    return if version < "2.5.10"
+    target_version "2.5.10"
 
     r.set("foo", "a")
     r.set("bar", "b")

test/distributed_commands_on_strings_test.rb

@@ -47,7 +47,7 @@ def test_msetnx_mapped
   end
 
   def test_bitop
-    return if version < "2.5.10"
+    target_version "2.5.10"
 
     assert_raise Redis::Distributed::CannotDistribute do
       r.set("foo", "a")

test/distributed_commands_requiring_clustering_test.rb

@@ -147,7 +147,7 @@ def test_sort_with_store
   end
 
   def test_bitop
-    return if version < "2.5.10"
+    target_version "2.5.10"
 
     r.set("{qux}foo", "a")
     r.set("{qux}bar", "b")

test/distributed_remote_server_control_commands_test.rb

@@ -28,7 +28,7 @@ def test_info
   end
 
   def test_info_commandstats
-    return if version < "2.5.7"
+    target_version "2.5.7"
 
     r.nodes.each { |n| n.config(:resetstat) }
     r.ping # Executed on every node
@@ -52,7 +52,7 @@ def test_echo
   end
 
   def test_time
-    return if version < "2.5.4"
+    target_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).

test/distributed_scripting_test.rb

@@ -11,7 +11,7 @@ def to_sha(script)
   end
 
   def test_script_exists
-    return if version < "2.5.9" # 2.6-rc1
+    target_version "2.5.9" # 2.6-rc1
 
     a = to_sha("return 1")
     b = a.succ
@@ -24,7 +24,7 @@ def test_script_exists
   end
 
   def test_script_flush
-    return if version < "2.5.9" # 2.6-rc1
+    target_version "2.5.9" # 2.6-rc1
 
     sha = to_sha("return 1")
     assert r.script(:exists, sha).first
@@ -33,15 +33,15 @@ def test_script_flush
   end
 
   def test_script_kill
-    return if version < "2.5.9" # 2.6-rc1
+    target_version "2.5.9" # 2.6-rc1
 
     redis_mock(:script => lambda { |arg| "+#{arg.upcase}" }) do |redis|
       assert_equal ["KILL"], redis.script(:kill)
     end
   end
 
   def test_eval
-    return if version < "2.5.9" # 2.6-rc1
+    target_version "2.5.9" # 2.6-rc1
 
     assert_raises(Redis::Distributed::CannotDistribute) do
       r.eval("return #KEYS")
@@ -56,7 +56,7 @@ def test_eval
   end
 
   def test_eval_with_options_hash
-    return if version < "2.5.9" # 2.6-rc1
+    target_version "2.5.9" # 2.6-rc1
 
     assert_raises(Redis::Distributed::CannotDistribute) do
       r.eval("return #KEYS", {})
@@ -71,7 +71,7 @@ def test_eval_with_options_hash
   end
 
   def test_evalsha
-    return if version < "2.5.9" # 2.6-rc1
+    target_version "2.5.9" # 2.6-rc1
 
     assert_raises(Redis::Distributed::CannotDistribute) do
       r.evalsha(to_sha("return #KEYS"))
@@ -86,7 +86,7 @@ def test_evalsha
   end
 
   def test_evalsha_with_options_hash
-    return if version < "2.5.9" # 2.6-rc1
+    target_version "2.5.9" # 2.6-rc1
 
     assert_raises(Redis::Distributed::CannotDistribute) do
       r.evalsha(to_sha("return #KEYS"), {})

test/helper.rb

@@ -153,6 +153,10 @@ def redis_mock_with_handler(handler, options = {}, &blk)
     def assert_in_range(range, value)
       assert range.include?(value), "expected #{value} to be in #{range.inspect}"
     end
+
+    def target_version(target)
+      skip("Requires Redis > #{target}") if version < target
+    end
   end
 
   module Client

test/internals_test.rb

@@ -128,7 +128,7 @@ def test_tcp_keepalive
   end
 
   def test_time
-    return if version < "2.5.4"
+    target_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).

test/lint/hashes.rb

@@ -31,7 +31,7 @@ def test_hdel
     end
 
     def test_variadic_hdel
-      return if version < "2.3.9"
+      target_version "2.3.9"
 
       r.hset("foo", "f1", "s1")
       r.hset("foo", "f2", "s2")
@@ -144,7 +144,7 @@ def test_hincrby
     end
 
     def test_hincrbyfloat
-      return if version < "2.5.4"
+      target_version "2.5.4"
 
       r.hincrbyfloat("foo", "f1", 1.23)
 

test/lint/lists.rb

@@ -11,7 +11,7 @@ def test_lpush
     end
 
     def test_variadic_lpush
-      return if version < "2.3.9" # 2.4-rc6
+      target_version "2.3.9" # 2.4-rc6
 
       assert_equal 3, r.lpush("foo", ["s1", "s2", "s3"])
       assert_equal 3, r.llen("foo")
@@ -36,7 +36,7 @@ def test_rpush
     end
 
     def test_variadic_rpush
-      return if version < "2.3.9" # 2.4-rc6
+      target_version "2.3.9" # 2.4-rc6
 
       assert_equal 3, r.rpush("foo", ["s1", "s2", "s3"])
       assert_equal 3, r.llen("foo")

test/lint/sets.rb

@@ -11,7 +11,7 @@ def test_sadd
     end
 
     def test_variadic_sadd
-      return if version < "2.3.9" # 2.4-rc6
+      target_version "2.3.9" # 2.4-rc6
 
       assert_equal 2, r.sadd("foo", ["s1", "s2"])
       assert_equal 1, r.sadd("foo", ["s1", "s2", "s3"])
@@ -30,7 +30,7 @@ def test_srem
     end
 
     def test_variadic_srem
-      return if version < "2.3.9" # 2.4-rc6
+      target_version "2.3.9" # 2.4-rc6
 
       r.sadd("foo", "s1")
       r.sadd("foo", "s2")