Skip to content
Sign up
This repository

public / rediscluster-py Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

add test cases for pexpire, pexpireat, incrbyfloat, hincrbyfloat, mul… 

…ti lpush/rpush
  • Loading branch information...
commit 8008b3833d184f183adaf65f0aae2887cb66f005 1 parent 3d87be8
Salimane Adjao Moustapha authored

Showing 2 changed files with 125 additions and 5 deletions. Show Diff Stats Hide Diff Stats

  1. 8  rediscluster/cluster_client.py
  2. 122  tests/cluster_commands.py
8  rediscluster/cluster_client.py
View 
@@ -33,9 +33,9 @@ class StrictRedisCluster:
33 33 
     _write_keys = {
34 34 
         'append': 'append', 'blpop': 'blpop', 'brpop': 'brpop', 'brpoplpush': 'brpoplpush',
35 35 
         'decr': 'decr', 'decrby': 'decrby', 'del': 'del', 'exists': 'exists', 'hexists': 'hexists',
36   
-        'expire': 'expire', 'expireat': 'expireat', 'getset': 'getset', 'hdel': 'hdel',
37   
-        'hincrby': 'hincrby', 'hset': 'hset', 'hsetnx': 'hsetnx', 'hmset': 'hmset',
38   
-        'incr': 'incr', 'incrby': 'incrby', 'linsert': 'linsert', 'lpop': 'lpop',
  36 
+        'expire': 'expire', 'expireat': 'expireat', 'pexpire': 'pexpire', 'pexpireat': 'pexpireat', 'getset': 'getset', 'hdel': 'hdel',
  37 
+        'hincrby': 'hincrby', 'hincrbyfloat': 'hincrbyfloat', 'hset': 'hset', 'hsetnx': 'hsetnx', 'hmset': 'hmset',
  38 
+        'incr': 'incr', 'incrby': 'incrby', 'incrbyfloat': 'incrbyfloat', 'linsert': 'linsert', 'lpop': 'lpop',
39 39 
         'lpush': 'lpush', 'lpushx': 'lpushx', 'lrem': 'lrem', 'lset': 'lset',
40 40 
         'ltrim': 'ltrim', 'move': 'move',
41 41 
         'persist': 'persist', 'publish': 'publish', 'psubscribe': 'psubscribe', 'punsubscribe': 'punsubscribe',
 
@@ -77,7 +77,7 @@ class StrictRedisCluster:
77 77 
         'flushall': 'flushall', 'flushdb': 'flushdb',
78 78 
         'randomkey': 'randomkey', 'sync': 'sync',
79 79 
         'config_set': 'config_set', 'config_get': 'config_get',
80   
-        'time': 'time'
  80 
+        'time': 'time', 'client_list': 'client_list'
81 81 
     }
82 82
83 83 
     def __init__(self, cluster={}, db=0):
122  tests/cluster_commands.py
View 
@@ -99,6 +99,11 @@ def test_delitem(self):
99 99 
         del self.client['a']
100 100 
         self.assertEquals(self.client.get('a'), None)
101 101
  102 
+    def test_client_list(self):
  103 
+        for clients in dictvalues(self.client.client_list()):
  104 
+            self.assert_(isinstance(clients[0], dict))
  105 
+            self.assert_('addr' in clients[0])
  106 
+
102 107 
     def test_config_get(self):
103 108 
         for data in dictvalues(self.client.config_get()):
104 109 
             self.assert_('maxmemory' in data)
 
@@ -225,7 +230,44 @@ def test_expireat(self):
225 230 
         # expire at given a datetime object
226 231 
         self.client['b'] = 'bar'
227 232 
         self.assertEquals(self.client.expireat('b', expire_at), True)
228   
-        self.assertAlmostEquals(self.client.ttl('b'), 60, delta=2)
  233 
+        self.assertEquals(self.client.ttl('b'), 60)
  234 
+
  235 
+    def test_pexpire(self):
  236 
+        for info in dictvalues(self.client.info()):
  237 
+            version = info['redis_version']
  238 
+            if StrictVersion(version) < StrictVersion('2.5.0'):
  239 
+                try:
  240 
+                    raise unittest.SkipTest()
  241 
+                except AttributeError:
  242 
+                    return
  243 
+
  244 
+        self.assertEquals(self.client.pexpire('a', 10000), False)
  245 
+        self.client['a'] = 'foo'
  246 
+        self.assertEquals(self.client.pexpire('a', 10000), True)
  247 
+        self.assert_(self.client.pttl('a') <= 10000)
  248 
+        self.assertEquals(self.client.persist('a'), True)
  249 
+        self.assertEquals(self.client.pttl('a'), -1)
  250 
+
  251 
+    def test_pexpireat(self):
  252 
+        for info in dictvalues(self.client.info()):
  253 
+            version = info['redis_version']
  254 
+            if StrictVersion(version) < StrictVersion('2.5.0'):
  255 
+                try:
  256 
+                    raise unittest.SkipTest()
  257 
+                except AttributeError:
  258 
+                    return
  259 
+
  260 
+        expire_at = datetime.datetime.now() + datetime.timedelta(minutes=1)
  261 
+        self.assertEquals(self.client.pexpireat('a', expire_at), False)
  262 
+        self.client['a'] = 'foo'
  263 
+        # expire at in unix time (milliseconds)
  264 
+        expire_at_seconds = int(time.mktime(expire_at.timetuple())) * 1000
  265 
+        self.assertEquals(self.client.pexpireat('a', expire_at_seconds), True)
  266 
+        self.assert_(self.client.ttl('a') <= 60)
  267 
+        # expire at given a datetime object
  268 
+        self.client['b'] = 'bar'
  269 
+        self.assertEquals(self.client.pexpireat('b', expire_at), True)
  270 
+        self.assert_(self.client.ttl('b') <= 60)
229 271
230 272 
     def test_get_set_bit(self):
231 273 
         self.assertEquals(self.client.getbit('a', 5), False)
 
@@ -364,6 +406,20 @@ def test_incr(self):
364 406 
         self.assertEquals(self.client.incr('a', amount=5), 7)
365 407 
         self.assertEquals(self.client['a'], b('7'))
366 408
  409 
+    def test_incrbyfloat(self):
  410 
+        for info in dictvalues(self.client.info()):
  411 
+            version = info['redis_version']
  412 
+            if StrictVersion(version) < StrictVersion('2.5.0'):
  413 
+                try:
  414 
+                    raise unittest.SkipTest()
  415 
+                except AttributeError:
  416 
+                    return
  417 
+
  418 
+        self.assertEquals(self.client.incrbyfloat('a'), 1.0)
  419 
+        self.assertEquals(self.client['a'], b('1'))
  420 
+        self.assertEquals(self.client.incrbyfloat('a', 1.1), 2.1)
  421 
+        self.assertEquals(float(self.client['a']), float(2.1))
  422 
+
367 423 
     def test_keys(self):
368 424 
         try:
369 425 
             raise unittest.SkipTest()
 
@@ -613,6 +669,11 @@ def test_lpush(self):
613 669 
         # real logic
614 670 
         self.assertEqual(1, self.client.lpush('a', 'b'))
615 671 
         self.assertEqual(2, self.client.lpush('a', 'a'))
  672 
+        for info in dictvalues(self.client.info()):
  673 
+            version = info['redis_version']
  674 
+            if StrictVersion(version) >= StrictVersion('2.4.0'):
  675 
+                self.assertEqual(4, self.client.lpush('a', 'b', 'a'))
  676 
+                break
616 677
617 678 
         self.assertEquals(self.client.lindex('a', 0), b('a'))
618 679 
         self.assertEquals(self.client.lindex('a', 1), b('b'))
 
@@ -752,6 +813,11 @@ def test_rpush(self):
752 813 
         # real logic
753 814 
         self.assertEqual(1, self.client.rpush('a', 'a'))
754 815 
         self.assertEqual(2, self.client.rpush('a', 'b'))
  816 
+        for info in dictvalues(self.client.info()):
  817 
+            version = info['redis_version']
  818 
+            if StrictVersion(version) >= StrictVersion('2.4.0'):
  819 
+                self.assertEqual(4, self.client.rpush('a', 'a', 'b'))
  820 
+                break
755 821
756 822 
         self.assertEquals(self.client.lindex('a', 0), b('a'))
757 823 
         self.assertEquals(self.client.lindex('a', 1), b('b'))
 
@@ -936,6 +1002,15 @@ def test_srandmember(self):
936 1002 
         self.make_set('a', 'abc')
937 1003 
         self.assert_(self.client.srandmember('a') in b('abc'))
938 1004
  1005 
+        for info in dictvalues(self.client.info()):
  1006 
+            version = info['redis_version']
  1007 
+            if StrictVersion(version) >= StrictVersion('2.5.0'):
  1008 
+                randoms = self.client.srandmember('a', number=2)
  1009 
+                self.assertEquals(len(randoms), 2)
  1010 
+                for r in randoms:
  1011 
+                    self.assert_(r in b('abc'))
  1012 
+                break
  1013 
+
939 1014 
     def test_srem(self):
940 1015 
         # key is not set
941 1016 
         self.assertEquals(self.client.srem('a', 'a'), False)
 
@@ -1406,6 +1481,25 @@ def test_hincrby(self):
1406 1481 
         self.assertRaises(
1407 1482 
             rediscluster.ResponseError, self.client.hincrby, 'a', 'a3')
1408 1483
  1484 
+    def test_hincrbyfloat(self):
  1485 
+        for info in dictvalues(self.client.info()):
  1486 
+            version = info['redis_version']
  1487 
+            if StrictVersion(version) < StrictVersion('2.5.0'):
  1488 
+                try:
  1489 
+                    raise unittest.SkipTest()
  1490 
+                except AttributeError:
  1491 
+                    return
  1492 
+
  1493 
+        # key is not a hash
  1494 
+        self.client['a'] = 'a'
  1495 
+        self.assertRaises(rediscluster.ResponseError,
  1496 
+                          self.client.hincrbyfloat, 'a', 'a1')
  1497 
+        del self.client['a']
  1498 
+        # no key should create the hash and incr the key's value to 1
  1499 
+        self.assertEquals(self.client.hincrbyfloat('a', 'a1'), 1.0)
  1500 
+        self.assertEquals(self.client.hincrbyfloat('a', 'a1'), 2.0)
  1501 
+        self.assertEquals(self.client.hincrbyfloat('a', 'a1', 1.2), 3.2)
  1502 
+
1409 1503 
     def test_hkeys(self):
1410 1504 
         # key is not a hash
1411 1505 
         self.client['a'] = 'a'
 
@@ -1628,6 +1722,23 @@ def test_strict_expire(self):
1628 1722 
         self.assertEquals(client.persist('a'), True)
1629 1723 
         self.assertEquals(client.ttl('a'), -1)
1630 1724
  1725 
+    def test_strict_pexpire(self):
  1726 
+        client = self.get_client(rediscluster.StrictRedisCluster)
  1727 
+        for info in dictvalues(self.client.info()):
  1728 
+            version = info['redis_version']
  1729 
+            if StrictVersion(version) < StrictVersion('2.5.0'):
  1730 
+                try:
  1731 
+                    raise unittest.SkipTest()
  1732 
+                except AttributeError:
  1733 
+                    return
  1734 
+
  1735 
+        self.assertEquals(client.pexpire('a', 10000), False)
  1736 
+        self.client['a'] = 'foo'
  1737 
+        self.assertEquals(client.pexpire('a', 10000), True)
  1738 
+        self.assert_(client.pttl('a') <= 10000)
  1739 
+        self.assertEquals(client.persist('a'), True)
  1740 
+        self.assertEquals(client.pttl('a'), -1)
  1741 
+
1631 1742 
     ## BINARY SAFE
1632 1743 
     # TODO add more tests
1633 1744 
     def test_binary_get_set(self):
 
@@ -1706,3 +1817,12 @@ def test_22_info(self):
1706 1817 
         data = ''.join(data)
1707 1818 
         self.client.set('a', data)
1708 1819 
         self.assertEquals(self.client.get('a'), b(data))"""
  1820 
+
  1821 
+    def test_floating_point_encoding(self):
  1822 
+        """
  1823 
+        High precision floating point values sent to the server should keep
  1824 
+        precision.
  1825 
+        """
  1826 
+        timestamp = 1349673917.939762
  1827 
+        self.client.zadd('a', timestamp, 'aaa')
  1828 
+        self.assertEquals(self.client.zscore('a', 'aaa'), timestamp)

0 notes on commit 8008b38

Please sign in to comment.
Something went wrong with that request. Please try again.