fixup! fixup! fixup! fixup! fixup! fixup! Adapt to redis 3.*

python/minqlx/database.py

@@ -319,9 +319,6 @@ def close(self):
                 Redis._pool = None
 
     if redis.VERSION > (3,):
-        def lrem(self, name, count, value):
-            return self.r.lrem(name, value, count)
-
         def setex(self, name, time, value):
             return self.r.setex(name, value, time)
 

python/tests/test_database.py

@@ -1,8 +1,11 @@
-from unittest import TestCase
-import database
 import random
 import string
 from time import sleep
+from unittest import TestCase
+
+import redis
+
+import database
 
 
 def random_string():
@@ -28,6 +31,20 @@ def test_zadd_01(self):
         self.assertEqual(res["player1"], 2)
         self.assertEqual(res["player2"], 6)
 
+        c.zadd(key, 4, "player2")
+        res = dict(c.zrange(key, 0, -1, withscores=True))
+        self.assertEqual(res["player1"], 2)
+        self.assertEqual(res["player2"], 4)
+
+    def test_zadd_02(self):
+        c = self.c
+        key = "zadd_02_key_" + random_string()
+
+        # redis-py 3.* introduced xx, nx, ch and incr kwarg params
+        # this codes deliberately does not work in redis-py 2.*
+        if redis.VERSION < (3,):
+            self.skipTest("Old version of redis package: %s" % (redis.VERSION,))
+        c.zadd(key, 5, "player1", 6, "player2")
         c.zadd(key, {"player1": 3}, xx=True)
         res = dict(c.zrange(key, 0, -1, withscores=True))
         self.assertEqual(res["player1"], 3)