Add the getdel command available from redis 6.2.0

docker/base/Dockerfile

@@ -1 +1 @@
-FROM redis:6.0.9-buster
+FROM redis:6.2-buster

redis/client.py

@@ -1666,6 +1666,13 @@ def get(self, name):
         """
         return self.execute_command('GET', name)
 
+    def getdel(self, name):
+        """
+        Return the value at key ``name``, or None if the key doesn't exist.
+        Delete the key once read.
+        """
+        return self.execute_command('GETDEL', name)
+
     def __getitem__(self, name):
         """
         Return the value at key ``name``, raises a KeyError if the key

tests/conftest.py

@@ -10,7 +10,7 @@
 # redis 6 release candidates report a version number of 5.9.x. Use this
 # constant for skip_if decorators as a placeholder until 6.0.0 is officially
 # released
-REDIS_6_VERSION = '5.9.0'
+REDIS_6_VERSION = '6.2.0'
 
 
 REDIS_INFO = {}

tests/test_commands.py

@@ -112,9 +112,10 @@ def teardown():
             'categories': ['-@all'],
             'commands': [],
             'enabled': False,
-            'flags': ['off'],
+            'flags': ['off', 'sanitize-payload'],
             'keys': [],
             'passwords': [],
+            'channels': []
         }
 
         # test nopass=True
@@ -123,9 +124,10 @@ def teardown():
             'categories': ['-@all'],
             'commands': [],
             'enabled': True,
-            'flags': ['on', 'nopass'],
+            'flags': ['on', 'nopass', 'sanitize-payload'],
             'keys': [],
             'passwords': [],
+            'channels': [],
         }
 
         # test all args
@@ -138,7 +140,7 @@ def teardown():
         assert set(acl['categories']) == set(['-@all', '+@set', '+@hash'])
         assert set(acl['commands']) == set(['+get', '+mget', '-hset'])
         assert acl['enabled'] is True
-        assert acl['flags'] == ['on']
+        assert acl['flags'] == ['on', 'sanitize-payload']
         assert set(acl['keys']) == set([b'cache:*', b'objects:*'])
         assert len(acl['passwords']) == 2
 
@@ -157,7 +159,7 @@ def teardown():
         assert set(acl['categories']) == set(['-@all', '+@set', '+@hash'])
         assert set(acl['commands']) == set(['+get', '+mget'])
         assert acl['enabled'] is True
-        assert acl['flags'] == ['on']
+        assert acl['flags'] == ['on', 'sanitize-payload']
         assert set(acl['keys']) == set([b'cache:*', b'objects:*'])
         assert len(acl['passwords']) == 2
 
@@ -196,7 +198,7 @@ def teardown():
 
         assert r.acl_setuser(username, enabled=False, reset=True)
         users = r.acl_list()
-        assert 'user %s off -@all' % username in users
+        assert 'user %s off sanitize-payload -@all' % username in users
 
     @skip_if_server_version_lt(REDIS_6_VERSION)
     def test_acl_log(self, r, request):
@@ -705,6 +707,13 @@ def test_get_and_set(self, r):
         assert r.get('integer') == str(integer).encode()
         assert r.get('unicode_string').decode('utf-8') == unicode_string
 
+    def test_getdel(self, r):
+        value = b'value'
+        r.set('a', value)
+        assert r.getdel('a') == value
+        assert r.get('a') is None
+        assert r.getdel('a') is None
+
     def test_getitem_and_setitem(self, r):
         r['a'] = 'bar'
         assert r['a'] == b'bar'

tests/test_pubsub.py

@@ -474,7 +474,7 @@ class TestPubSubSubcommands:
     def test_pubsub_channels(self, r):
         p = r.pubsub()
         p.subscribe('foo', 'bar', 'baz', 'quux')
-        for i in range(4):
+        for _ in range(4):
             assert wait_for_message(p)['type'] == 'subscribe'
         expected = [b'bar', b'baz', b'foo', b'quux']
         assert all([channel in r.pubsub_channels() for channel in expected])
@@ -483,11 +483,11 @@ def test_pubsub_channels(self, r):
     def test_pubsub_numsub(self, r):
         p1 = r.pubsub()
         p1.subscribe('foo', 'bar', 'baz')
-        for i in range(3):
+        for _ in range(3):
             assert wait_for_message(p1)['type'] == 'subscribe'
         p2 = r.pubsub()
         p2.subscribe('bar', 'baz')
-        for i in range(2):
+        for _ in range(2):
             assert wait_for_message(p2)['type'] == 'subscribe'
         p3 = r.pubsub()
         p3.subscribe('baz')
@@ -500,7 +500,7 @@ def test_pubsub_numsub(self, r):
     def test_pubsub_numpat(self, r):
         p = r.pubsub()
         p.psubscribe('*oo', '*ar', 'b*z')
-        for i in range(3):
+        for _ in range(3):
             assert wait_for_message(p)['type'] == 'psubscribe'
         assert r.pubsub_numpat() == 3
 
@@ -564,6 +564,6 @@ def exception_handler(ex, pubsub, thread):
                 exception_handler=exception_handler
             )
 
-        assert event.wait(timeout=1.0)
+        assert event.wait(timeout=10.0)
         pubsub_thread.join(timeout=1.0)
         assert not pubsub_thread.is_alive()