diff options
Diffstat (limited to 'tests/test_monitor.py')
| -rw-r--r-- | tests/test_monitor.py | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/tests/test_monitor.py b/tests/test_monitor.py index 7ef8ecd..0e39ec0 100644 --- a/tests/test_monitor.py +++ b/tests/test_monitor.py @@ -1,31 +1,15 @@ from __future__ import unicode_literals from redis._compat import unicode -from .conftest import skip_if_server_version_lt +from .conftest import wait_for_command -def wait_for_command(client, monitor, command): - # issue a command with a key name that's local to this process. - # if we find a command with our key before the command we're waiting - # for, something went wrong - key = '__REDIS-PY-%s__' % str(client.client_id()) - client.get(key) - while True: - monitor_response = monitor.next_command() - if command in monitor_response['command']: - return monitor_response - if key in monitor_response['command']: - return None - - -class TestPipeline(object): - @skip_if_server_version_lt('5.0.0') +class TestMonitor(object): def test_wait_command_not_found(self, r): "Make sure the wait_for_command func works when command is not found" with r.monitor() as m: response = wait_for_command(r, m, 'nothing') assert response is None - @skip_if_server_version_lt('5.0.0') def test_response_values(self, r): with r.monitor() as m: r.ping() @@ -37,14 +21,12 @@ class TestPipeline(object): assert isinstance(response['client_port'], unicode) assert response['command'] == 'PING' - @skip_if_server_version_lt('5.0.0') def test_command_with_quoted_key(self, r): with r.monitor() as m: r.get('foo"bar') response = wait_for_command(r, m, 'GET foo"bar') assert response['command'] == 'GET foo"bar' - @skip_if_server_version_lt('5.0.0') def test_command_with_binary_data(self, r): with r.monitor() as m: byte_string = b'foo\x92' @@ -52,7 +34,6 @@ class TestPipeline(object): response = wait_for_command(r, m, 'GET foo\\x92') assert response['command'] == 'GET foo\\x92' - @skip_if_server_version_lt('5.0.0') def test_lua_script(self, r): with r.monitor() as m: script = 'return redis.call("GET", "foo")' |