Skip to content

Commit ea4d04a

Browse files
committed
Fix redis-clustering gem to pass the test with latest dependencies
1 parent 1f37095 commit ea4d04a

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ jobs:
221221
env:
222222
TIMEOUT: "15"
223223
LOW_TIMEOUT: "0.14"
224-
REDIS_BRANCH: "7.0"
224+
REDIS_BRANCH: "7.2"
225225
BUNDLE_GEMFILE: cluster/Gemfile
226226
steps:
227227
- name: Check out code

cluster/lib/redis/cluster/client.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ def initialize(*)
2828
ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
2929

3030
def id
31-
@router.node.node_keys.join(' ')
31+
@router.node_keys.join(' ')
3232
end
3333

3434
def server_url
35-
@router.node.node_keys
35+
@router.node_keys
3636
end
3737

3838
def connected?

cluster/redis-clustering.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ Gem::Specification.new do |s|
4747
s.required_ruby_version = '>= 2.7.0'
4848

4949
s.add_runtime_dependency('redis', s.version)
50-
s.add_runtime_dependency('redis-cluster-client', '>= 0.3.7')
50+
s.add_runtime_dependency('redis-cluster-client', '>= 0.6.1')
5151
end

cluster/test/commands_on_keys_test.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def test_migrate
4747
def test_object
4848
redis.lpush('mylist', 'Hello World')
4949
assert_equal 1, redis.object('refcount', 'mylist')
50-
assert_equal 'quicklist', redis.object('encoding', 'mylist')
5150
assert(redis.object('idletime', 'mylist') >= 0)
5251

5352
redis.set('foo', 1000)

cluster/test/commands_on_server_test.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@ def test_client_kill
4141

4242
def test_client_list
4343
a_client_info = redis.client(:list).first
44-
actual = a_client_info.keys.sort
45-
expected = %w[addr age cmd db events fd flags id idle multi name obl oll omem psub qbuf qbuf-free sub]
46-
expected << 'user' << 'argv-mem' << 'tot-mem' if version >= '6'
47-
expected << 'laddr' << 'redir' if version >= '6.2'
48-
expected << "multi-mem" << "rbp" << "rbs" << "resp" << "ssub" if version >= '7.0'
49-
assert_equal expected.sort, actual.sort
44+
assert_instance_of Hash, a_client_info
45+
assert_includes a_client_info, 'addr'
5046
end
5147

5248
def test_client_getname

0 commit comments

Comments
 (0)