summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorChayim I. Kirshen <c@kirshen.com>2021-12-02 19:22:03 +0200
committerChayim I. Kirshen <c@kirshen.com>2021-12-02 19:22:03 +0200
commitd1ae2eb7f183103a8eff781beb52eec7446ad2a3 (patch)
tree66ae3706f2226eb04b8a65dd228b208b24298deb /tests
parentf5d5610f0b77468bc84c3c9764a5d86ee7883410 (diff)
downloadredis-py-ROLE.tar.gz
master merge, fixing tests with now clusterROLE
Diffstat (limited to 'tests')
-rw-r--r--tests/test_commands.py6
-rw-r--r--tests/test_connection_pool.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/test_commands.py b/tests/test_commands.py
index af52fbd..556df84 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -653,12 +653,14 @@ class TestRedisCommands:
def test_quit(self, r):
assert r.quit()
- @skip_if_server_version_lt('2.8.12')
+ @skip_if_server_version_lt("2.8.12")
+ @pytest.mark.onlynoncluster
def test_role(self, r):
- assert r.role()[0] == b'master'
+ assert r.role()[0] == b"master"
assert isinstance(r.role()[1], int)
assert isinstance(r.role()[2], list)
+ @pytest.mark.onlynoncluster
def test_slowlog_get(self, r, slowlog):
assert r.slowlog_reset()
unicode_string = chr(3456) + "abcd" + chr(3421)
diff --git a/tests/test_connection_pool.py b/tests/test_connection_pool.py
index 276e77c..138fcad 100644
--- a/tests/test_connection_pool.py
+++ b/tests/test_connection_pool.py
@@ -450,7 +450,7 @@ class TestConnectionPoolUnixSocketURLParsing:
pass
pool = redis.ConnectionPool.from_url(
- 'unix:///socket', connection_class=MyConnection
+ "unix:///socket", connection_class=MyConnection
)
assert pool.connection_class == MyConnection
@@ -469,7 +469,7 @@ class TestSSLConnectionURLParsing:
pass
pool = redis.ConnectionPool.from_url(
- 'rediss://my.host', connection_class=MyConnection
+ "rediss://my.host", connection_class=MyConnection
)
assert pool.connection_class == MyConnection