Test against Redis 6

Author: ferrous26

.travis.yml

@@ -27,9 +27,9 @@ env:
     - TIMEOUT=30
     - LOW_TIMEOUT=0.01
   matrix:
-    - DRIVER=ruby      REDIS_BRANCH=5.0
-    - DRIVER=hiredis   REDIS_BRANCH=5.0
-    - DRIVER=synchrony REDIS_BRANCH=5.0
+    - DRIVER=ruby      REDIS_BRANCH=6.0
+    - DRIVER=hiredis   REDIS_BRANCH=6.0
+    - DRIVER=synchrony REDIS_BRANCH=6.0
 
 matrix:
   exclude:
@@ -43,6 +43,8 @@ matrix:
       env: DRIVER=ruby REDIS_BRANCH=3.2
     - rvm: "2.3"
       env: DRIVER=ruby REDIS_BRANCH=4.0
+    - rvm: "2.3"
+      env: DRIVER=ruby REDIS_BRANCH=5.0
 
 notifications:
   irc:

makefile

@@ -1,4 +1,4 @@
-REDIS_BRANCH       ?= 5.0
+REDIS_BRANCH       ?= 6.0
 TMP                := tmp
 BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
 TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
@@ -34,7 +34,7 @@ ${TMP}:
 ${BINARY}: ${TMP}
 	@bin/build ${REDIS_BRANCH} $<
 
-test: 
+test:
 	@env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
 
 stop:

test/cluster_commands_on_keys_test.rb

@@ -98,7 +98,13 @@ def test_touch
       set_some_keys
       assert_equal 1, redis.touch('key1')
       assert_equal 1, redis.touch('key2')
-      assert_equal 1, redis.touch('key1', 'key2')
+      if version < '6'
+        assert_equal 1, redis.touch('key1', 'key2')
+      else
+        assert_raises(Redis::CommandError, "CROSSSLOT Keys in request don't hash to the same slot") do
+          redis.touch('key1', 'key2')
+        end
+      end
       assert_equal 2, redis.touch('{key}1', '{key}2')
     end
   end

test/cluster_commands_on_server_test.rb

@@ -43,6 +43,9 @@ def test_client_list
     a_client_info = redis.client(:list).first
     actual = a_client_info.keys.sort
     expected = %w[addr age cmd db events fd flags id idle multi name obl oll omem psub qbuf qbuf-free sub]
+    if version >= '6'
+      expected << 'user'
+    end
     assert_equal expected, actual
   end
 
@@ -83,6 +86,11 @@ def test_command_info
       ['set', -3, %w[write denyoom], 1, 1, 1],
       ['eval', -3, %w[noscript movablekeys], 0, 0, 0]
     ]
+    if version >= '6'
+      expected[0] << ["@read", "@string", "@fast"]
+      expected[1] << ["@write", "@string", "@slow"]
+      expected[2] << ["@slow", "@scripting"]
+    end
     assert_equal expected, redis.command(:info, :get, :set, :eval)
   end