diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2825e5ae6..c848e4407 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -221,7 +221,7 @@ jobs: env: TIMEOUT: "15" LOW_TIMEOUT: "0.14" - REDIS_BRANCH: "7.0" + REDIS_BRANCH: "7.2" BUNDLE_GEMFILE: cluster/Gemfile steps: - name: Check out code diff --git a/cluster/lib/redis/cluster/client.rb b/cluster/lib/redis/cluster/client.rb index a5a4fd1fc..fc6c118ff 100644 --- a/cluster/lib/redis/cluster/client.rb +++ b/cluster/lib/redis/cluster/client.rb @@ -28,11 +28,11 @@ def initialize(*) ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true) def id - @router.node.node_keys.join(' ') + @router.node_keys.join(' ') end def server_url - @router.node.node_keys + @router.node_keys end def connected? diff --git a/cluster/redis-clustering.gemspec b/cluster/redis-clustering.gemspec index 31cd9ae4a..81c7c86e3 100644 --- a/cluster/redis-clustering.gemspec +++ b/cluster/redis-clustering.gemspec @@ -47,5 +47,5 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.7.0' s.add_runtime_dependency('redis', s.version) - s.add_runtime_dependency('redis-cluster-client', '>= 0.3.7') + s.add_runtime_dependency('redis-cluster-client', '>= 0.6.1') end diff --git a/cluster/test/commands_on_keys_test.rb b/cluster/test/commands_on_keys_test.rb index f5397ffd0..6227e5b46 100644 --- a/cluster/test/commands_on_keys_test.rb +++ b/cluster/test/commands_on_keys_test.rb @@ -47,7 +47,6 @@ def test_migrate def test_object redis.lpush('mylist', 'Hello World') assert_equal 1, redis.object('refcount', 'mylist') - assert_equal 'quicklist', redis.object('encoding', 'mylist') assert(redis.object('idletime', 'mylist') >= 0) redis.set('foo', 1000) diff --git a/cluster/test/commands_on_server_test.rb b/cluster/test/commands_on_server_test.rb index f17b416fc..9bf158f5e 100644 --- a/cluster/test/commands_on_server_test.rb +++ b/cluster/test/commands_on_server_test.rb @@ -41,12 +41,8 @@ def test_client_kill 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] - expected << 'user' << 'argv-mem' << 'tot-mem' if version >= '6' - expected << 'laddr' << 'redir' if version >= '6.2' - expected << "multi-mem" << "rbp" << "rbs" << "resp" << "ssub" if version >= '7.0' - assert_equal expected.sort, actual.sort + assert_instance_of Hash, a_client_info + assert_includes a_client_info, 'addr' end def test_client_getname