Skip to content

Fix unit tests running against Redis 4.0.0 #1699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 11, 2021
Merged

Fix unit tests running against Redis 4.0.0 #1699

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5604573
Support desc for 3.5.3
AvitalFineRedis Nov 11, 2021
68c6323
fix test_restore (idletime and frequency are supported only from vers…
AvitalFineRedis Nov 11, 2021
2de175b
merge master
AvitalFineRedis Nov 11, 2021
3908633
acl_setuser is avalible from version 6.0.0 (test was added here https…
AvitalFineRedis Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/test_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ def test_client_kill_filter_by_laddr(self, r, r2):
client_2_addr = clients_by_name['redis-py-c2'].get('laddr')
assert r.client_kill_filter(laddr=client_2_addr)

@skip_if_server_version_lt('2.8.12')
@skip_if_server_version_lt('6.0.0')
def test_client_kill_filter_by_user(self, r, request):
killuser = 'user_to_kill'
r.acl_setuser(killuser, enabled=True, reset=True,
Expand Down Expand Up @@ -3660,15 +3660,17 @@ def test_restore(self, r):
assert r.restore(key2, 0, dumpdata)
assert r.ttl(key2) == -1

# idletime
@skip_if_server_version_lt('5.0.0')
def test_restore_idletime(self, r):
key = 'yayakey'
r.set(key, 'blee!')
dumpdata = r.dump(key)
r.delete(key)
assert r.restore(key, 0, dumpdata, idletime=5)
assert r.get(key) == b'blee!'

# frequency
@skip_if_server_version_lt('5.0.0')
def test_restore_frequency(self, r):
key = 'yayakey'
r.set(key, 'blee!')
dumpdata = r.dump(key)
Expand All @@ -3678,10 +3680,8 @@ def test_restore(self, r):

@skip_if_server_version_lt('5.0.0')
def test_replicaof(self, r):

with pytest.raises(redis.ResponseError):
assert r.replicaof("NO ONE")

assert r.replicaof("NO", "ONE")


Expand Down