Code review fixes

Signed-off-by: Theo Despoudis <thdespou@hotmail.com>

1 files changed, 22 insertions, 27 deletions

diff --git a/tests/test_commands.py b/tests/test_commands.py
index b6177f7..986345b 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -95,42 +95,37 @@ class TestRedisCommands(object):
         assert r.client_setname('redis_py_test')
         assert r.client_getname() == 'redis_py_test'
 
-    @skip_if_server_version_lt('2.4.0')
-    def test_client_kill(self, r, r3):
-        clients = r.client_list()
-        r.client_kill(clients[1].get('addr'))
-        clients = r.client_list()
-        assert len(clients) == 3
+    @skip_if_server_version_lt('2.6.9')
+    def test_client_kill(self, r, r2):
+        r.client_setname('redis-py-c1')
+        r2[0].client_setname('redis-py-c2')
+        r2[1].client_setname('redis-py-c3')
+        test_clients = [client for client in r.client_list()
+                        if client.get('name')
+                        in ['redis-py-c1', 'redis-py-c2', 'redis-py-c3']]
+        assert len(test_clients) == 3
+
+        resp = r.client_kill(test_clients[1].get('addr'))
+        assert isinstance(resp, bool) and resp is True
+
+        test_clients = [client for client in r.client_list()
+                        if client.get('name')
+                        in ['redis-py-c1', 'redis-py-c2', 'redis-py-c3']]
+        assert len(test_clients) == 2
 
     @skip_if_server_version_lt('2.8.12')
     def test_client_kill_filter_invalid_params(self, r):
-        # invalid type
-        with pytest.raises(exceptions.DataError):
-            r.client_kill_filter(123)
-
-        # empty list
-        with pytest.raises(exceptions.DataError):
-            r.client_kill_filter([])
-
-        # empty tuple
-        with pytest.raises(exceptions.DataError):
-            r.client_kill_filter(())
-
-        # missing values
+        # empty
         with pytest.raises(exceptions.DataError):
-            r.client_kill_filter(*["type", "master", "skipme"])
+            r.client_kill_filter()
 
-        # invalid filter
+        # invalid skipme
         with pytest.raises(exceptions.DataError):
-            r.client_kill_filter(*["type", "master", "allow", "yes"])
+            r.client_kill_filter(skipme="yeah")
 
         # invalid type
         with pytest.raises(exceptions.DataError):
-            r.client_kill_filter(*["type", "caster", "skipme", "yes"])
-
-        # invalid skipme
-        with pytest.raises(exceptions.DataError):
-            r.client_kill_filter(*["type", "master", "skipme", "yeah"])
+            r.client_kill_filter(_type="caster")
 
     @skip_if_server_version_lt('2.6.9')
     def test_client_list_after_client_setname(self, r):