Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't let RedisLists equal tuples #397

Merged
merged 1 commit into from
May 10, 2021
Merged
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 pottery/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def __eq__(self, other: Any) -> bool:
if len(self) != len(other):
# self and other are different lengths.
return False
elif isinstance(other, collections.abc.Sequence):
elif isinstance(other, collections.abc.MutableSequence):
# self and other are the same length, and other is an
# ordered collection too. Compare self's and other's
# elements, pair by pair.
Expand Down
1 change: 1 addition & 0 deletions pottery/nextid.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ def __current_id(self, value: int) -> None:
else:
if num_masters_set > len(self.masters) // 2: # pragma: no cover
return

raise QuorumNotAchieved(self.key, self.masters)


Expand Down
10 changes: 8 additions & 2 deletions tests/test_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ def test_eq_same_redis_instance_different_keys(self):

def test_eq_different_lengths(self):
squares1 = RedisList((1, 4, 9, 16, 25), redis=self.redis)
squares2 = (1, 4, 9, 16, 25, 36)
squares2 = [1, 4, 9, 16, 25, 36]
assert not squares1 == squares2
assert squares1 != squares2

def test_eq_different_items(self):
squares1 = RedisList((1, 4, 9, 16, 25), redis=self.redis)
squares2 = (4, 9, 16, 25, 36)
squares2 = [4, 9, 16, 25, 36]
assert not squares1 == squares2
assert squares1 != squares2

Expand All @@ -193,6 +193,12 @@ def test_eq_typeerror(self):
assert not squares == None
assert squares != None

def test_eq_tuple(self):
squares = RedisList((1, 4, 9, 16, 25), redis=self.redis)
assert squares == [1, 4, 9, 16, 25]
assert not squares == (1, 4, 9, 16, 25)
assert squares != (1, 4, 9, 16, 25)

def test_repr(self):
squares = RedisList((1, 4, 9, 16, 25), redis=self.redis)
assert repr(squares) == 'RedisList[1, 4, 9, 16, 25]'
Expand Down