From 8d2104e36e0e3576d59ddb40d0f1954bd95579c7 Mon Sep 17 00:00:00 2001 From: bpiotr Date: Wed, 19 Jul 2017 18:25:52 +0200 Subject: [PATCH] Making lrem argument order like it is in redis.client.StrictRedis since this commit: https://github.com/andymccurdy/redis-py/commit/7095c03cdbb9986b13e373e398b2509bea8c38bc --- mockredis/client.py | 2 +- mockredis/tests/test_list.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mockredis/client.py b/mockredis/client.py index 926e048..278755b 100644 --- a/mockredis/client.py +++ b/mockredis/client.py @@ -723,7 +723,7 @@ def rpush(self, key, *args): # Return the length of the list after the push operation return len(redis_list) - def lrem(self, key, value, count=0): + def lrem(self, key, count, value): """Emulate lrem.""" value = self._encode(value) redis_list = self._get_list(key, 'LREM') diff --git a/mockredis/tests/test_list.py b/mockredis/tests/test_list.py index d9b85be..f197a8a 100644 --- a/mockredis/tests/test_list.py +++ b/mockredis/tests/test_list.py @@ -145,54 +145,54 @@ def test_rpush(self): def test_lrem(self): self.redis.rpush(LIST1, VAL1, VAL2, VAL1, VAL3, VAL4, VAL2) - eq_(2, self.redis.lrem(LIST1, VAL1, 0)) + eq_(2, self.redis.lrem(LIST1, 0, VAL1)) eq_([bVAL2, bVAL3, bVAL4, bVAL2], self.redis.lrange(LIST1, 0, -1)) del self.redis[LIST1] self.redis.rpush(LIST1, VAL1, VAL2, VAL1, VAL3, VAL4, VAL2) - eq_(1, self.redis.lrem(LIST1, VAL2, 1)) + eq_(1, self.redis.lrem(LIST1, 1, VAL2)) eq_([bVAL1, bVAL1, bVAL3, bVAL4, bVAL2], self.redis.lrange(LIST1, 0, -1)) del self.redis[LIST1] self.redis.rpush(LIST1, VAL1, VAL2, VAL1, VAL3, VAL4, VAL2) - eq_(2, self.redis.lrem(LIST1, VAL1, 100)) + eq_(2, self.redis.lrem(LIST1, 100, VAL1)) eq_([bVAL2, bVAL3, bVAL4, bVAL2], self.redis.lrange(LIST1, 0, -1)) del self.redis[LIST1] self.redis.rpush(LIST1, VAL1, VAL2, VAL1, VAL3, VAL4, VAL2) - eq_(1, self.redis.lrem(LIST1, VAL3, -1)) + eq_(1, self.redis.lrem(LIST1, -1, VAL3)) eq_([bVAL1, bVAL2, bVAL1, bVAL4, bVAL2], self.redis.lrange(LIST1, 0, -1)) del self.redis[LIST1] self.redis.rpush(LIST1, VAL1, VAL2, VAL1, VAL3, VAL4, VAL2) - eq_(1, self.redis.lrem(LIST1, VAL2, -1)) + eq_(1, self.redis.lrem(LIST1, -1, VAL2)) eq_([bVAL1, bVAL2, bVAL1, bVAL3, bVAL4], self.redis.lrange(LIST1, 0, -1)) del self.redis[LIST1] self.redis.rpush(LIST1, VAL1, VAL2, VAL1, VAL3, VAL4, VAL2) - eq_(2, self.redis.lrem(LIST1, VAL2, -2)) + eq_(2, self.redis.lrem(LIST1, -2, VAL2)) eq_([bVAL1, bVAL1, bVAL3, bVAL4], self.redis.lrange(LIST1, 0, -1)) # string conversion self.redis.rpush(1, 1, "2", 3) - eq_(1, self.redis.lrem(1, "1")) - eq_(1, self.redis.lrem("1", 2)) + eq_(1, self.redis.lrem(1, 0, "1")) + eq_(1, self.redis.lrem("1", 0, 2)) eq_([b"3"], self.redis.lrange(1, 0, -1)) del self.redis["1"] del self.redis[LIST1] self.redis.rpush(LIST1, VAL1) - eq_(1, self.redis.lrem(LIST1, VAL1)) + eq_(1, self.redis.lrem(LIST1, 0, VAL1)) eq_([], self.redis.lrange(LIST1, 0, -1)) eq_([], self.redis.keys("*")) - eq_(0, self.redis.lrem("NON_EXISTENT_LIST", VAL1, 0)) + eq_(0, self.redis.lrem("NON_EXISTENT_LIST", 0, VAL1)) def test_brpoplpush(self): self.redis.rpush(LIST1, VAL1, VAL2)