Merge pull request jamesls#316 from jamesls/redis-py4

bmerry · web-flow · commit dabc4097a025 · 2021-11-09T08:00:34.000+02:00
Updates to support newer redis and redis-py
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ jobs:
             coverage: yes
     services:
       redis:
-        image: redis:6.0.10
+        image: redis:6.2.6
         ports:
           - 6379:6379
     steps:
diff --git a/fakeredis/_server.py b/fakeredis/_server.py
@@ -1757,14 +1757,38 @@ def linsert(self, key, where, pivot, value):
     def llen(self, key):
         return len(key.value)
 
-    @command((Key(list),))
-    def lpop(self, key):
-        try:
-            ret = key.value.pop(0)
-            key.updated()
-            return ret
-        except IndexError:
+    def _list_pop(self, get_slice, key, *args):
+        """Implements lpop and rpop.
+
+        `get_slice` must take a count and return a slice expression for the
+        range to pop.
+        """
+        # This implementation is somewhat contorted to match the odd
+        # behaviours described in https://github.com/redis/redis/issues/9680.
+        count = 1
+        if len(args) > 1:
+            raise SimpleError(SYNTAX_ERROR_MSG)
+        elif len(args) == 1:
+            count = args[0]
+            if count < 0:
+                raise SimpleError(INDEX_ERROR_MSG)
+            elif count == 0:
+                return None
+        if not key:
             return None
+        elif type(key.value) != list:
+            raise SimpleError(WRONGTYPE_MSG)
+        slc = get_slice(count)
+        ret = key.value[slc]
+        del key.value[slc]
+        key.updated()
+        if not args:
+            ret = ret[0]
+        return ret
+
+    @command((Key(),), (Int(),))
+    def lpop(self, key, *args):
+        return self._list_pop(lambda count: slice(None, count), key, *args)
 
     @command((Key(list), bytes), (bytes,))
     def lpush(self, key, *values):
@@ -1829,14 +1853,9 @@ def ltrim(self, key, start, stop):
                 key.update(new_value)
         return OK
 
-    @command((Key(list),))
-    def rpop(self, key):
-        try:
-            ret = key.value.pop()
-            key.updated()
-            return ret
-        except IndexError:
-            return None
+    @command((Key(list),), (Int(),))
+    def rpop(self, key, *args):
+        return self._list_pop(lambda count: slice(None, -count - 1, -1), key, *args)
 
     @command((Key(list, None), Key(list)))
     def rpoplpush(self, src, dst):
@@ -1905,13 +1924,11 @@ def sdiff(self, *keys):
     def sdiffstore(self, dst, *keys):
         return self._setop(lambda a, b: a - b, False, dst, *keys)
 
-    # The following keys can't be marked as sets because of the
-    # stop_if_empty early-out.
-    @command((Key(set),), (Key(),))
+    @command((Key(set),), (Key(set),))
     def sinter(self, *keys):
         return self._setop(lambda a, b: a & b, True, None, *keys)
 
-    @command((Key(), Key(set)), (Key(),))
+    @command((Key(), Key(set)), (Key(set),))
     def sinterstore(self, dst, *keys):
         return self._setop(lambda a, b: a & b, True, dst, *keys)
 
@@ -2358,8 +2375,10 @@ def zinterstore(self, dest, numkeys, *args):
     # Server commands
     # TODO: lots
 
-    @command((), flags='s')
-    def bgsave(self):
+    @command((), (bytes,), flags='s')
+    def bgsave(self, *args):
+        if len(args) > 1 or (len(args) == 1 and not casematch(args[0], b'schedule')):
+            raise SimpleError(SYNTAX_ERROR_MSG)
         self._server.lastsave = int(time.time())
         return BGSAVE_STARTED
 
@@ -2563,7 +2582,7 @@ def script(self, subcmd, *args):
         elif casematch(subcmd, b'exists'):
             return [int(sha1 in self._server.script_cache) for sha1 in args]
         elif casematch(subcmd, b'flush'):
-            if len(args) != 0:
+            if len(args) > 1 or (len(args) == 1 and casenorm(args[0]) not in {b'sync', b'async'}):
                 raise SimpleError(BAD_SUBCOMMAND_MSG.format('SCRIPT'))
             self._server.script_cache = {}
             return OK
diff --git a/requirements.txt b/requirements.txt
@@ -24,7 +24,7 @@ hypothesis==5.41.4
     # via -r requirements.in
 iniconfig==1.1.1
     # via pytest
-lupa==1.9
+lupa==1.10
     # via -r requirements.in
 mccabe==0.6.1
     # via flake8
@@ -40,7 +40,7 @@ pyflakes==2.2.0
     # via flake8
 pyparsing==2.4.7
     # via packaging
-pytest==6.1.2
+pytest==6.2.5
     # via
     #   -r requirements.in
     #   pytest-asyncio
diff --git a/setup.cfg b/setup.cfg
@@ -26,7 +26,7 @@ install_requires =
     # Minor version updates to redis tend to break fakeredis. If you
     # need to use fakeredis with a newer redis, please submit a PR that
     # relaxes this restriction and adds it to the Github Actions tests.
-    redis<3.6.0
+    redis<4.1.0
     six>=1.12
     sortedcontainers
 python_requires = >=3.5
diff --git a/test/test_fakeredis.py b/test/test_fakeredis.py
@@ -1041,6 +1041,22 @@ def test_lpop_wrong_type(r):
         r.lpop('foo')
 
 
+@pytest.mark.min_server('6.2')
+def test_lpop_count(r):
+    assert r.rpush('foo', 'one') == 1
+    assert r.rpush('foo', 'two') == 2
+    assert r.rpush('foo', 'three') == 3
+    assert raw_command(r, 'lpop', 'foo', 2) == [b'one', b'two']
+    # See https://github.com/redis/redis/issues/9680
+    assert raw_command(r, 'lpop', 'foo', 0) is None
+
+
+@pytest.mark.min_server('6.2')
+def test_lpop_count_negative(r):
+    with pytest.raises(redis.ResponseError):
+        raw_command(r, 'lpop', 'foo', -1)
+
+
 def test_lset(r):
     r.rpush('foo', 'one')
     r.rpush('foo', 'two')
@@ -1148,6 +1164,22 @@ def test_rpop_wrong_type(r):
         r.rpop('foo')
 
 
+@pytest.mark.min_server('6.2')
+def test_rpop_count(r):
+    assert r.rpush('foo', 'one') == 1
+    assert r.rpush('foo', 'two') == 2
+    assert r.rpush('foo', 'three') == 3
+    assert raw_command(r, 'rpop', 'foo', 2) == [b'three', b'two']
+    # See https://github.com/redis/redis/issues/9680
+    assert raw_command(r, 'rpop', 'foo', 0) is None
+
+
+@pytest.mark.min_server('6.2')
+def test_rpop_count_negative(r):
+    with pytest.raises(redis.ResponseError):
+        raw_command(r, 'rpop', 'foo', -1)
+
+
 def test_linsert_before(r):
     r.rpush('foo', 'hello')
     r.rpush('foo', 'world')
@@ -3454,6 +3486,10 @@ def test_save(r):
 
 def test_bgsave(r):
     assert r.bgsave()
+    with pytest.raises(ResponseError):
+        r.execute_command('BGSAVE', 'SCHEDULE', 'FOO')
+    with pytest.raises(ResponseError):
+        r.execute_command('BGSAVE', 'FOO')
 
 
 def test_lastsave(r):
@@ -5004,10 +5040,10 @@ def test_from_url_with_db_arg(self):
         assert db2.get('foo') == b'foo2'
 
     def test_from_url_db_value_error(self):
-        # In ValueError, should default to 0
+        # In case of ValueError, should default to 0, or be absent in redis-py 4.0
         db = fakeredis.FakeStrictRedis.from_url(
             'redis://localhost:6379/a')
-        assert db.connection_pool.connection_kwargs['db'] == 0
+        assert db.connection_pool.connection_kwargs.get('db', 0) == 0
 
     def test_can_pass_through_extra_args(self):
         db = fakeredis.FakeStrictRedis.from_url(
diff --git a/test/test_hypothesis.py b/test/test_hypothesis.py
@@ -239,7 +239,7 @@ def commands(*args, **kwargs):
                st.sampled_from(['before', 'after', 'BEFORE', 'AFTER']) | st.binary(),
                values, values)
     | commands(st.just('llen'), keys)
-    | commands(st.sampled_from(['lpop', 'rpop']), keys)
+    | commands(st.sampled_from(['lpop', 'rpop']), keys, st.just(None) | st.integers())
     | commands(st.sampled_from(['lpush', 'lpushx', 'rpush', 'rpushx']), keys, st.lists(values))
     | commands(st.just('lrange'), keys, counts, counts)
     | commands(st.just('lrem'), keys, counts, values)
