Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mockredis/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
20 changes: 10 additions & 10 deletions mockredis/tests/test_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down