mirror of
https://github.com/chatmail/core.git
synced 2026-05-09 01:46:30 +03:00
rename
This commit is contained in:
@@ -95,15 +95,15 @@ class Peer:
|
|||||||
assert not self.members
|
assert not self.members
|
||||||
self.members.add(self.id)
|
self.members.add(self.id)
|
||||||
for peer in peers:
|
for peer in peers:
|
||||||
self.add_member(peer.id)
|
self.send_add_member(peer.id)
|
||||||
self.relay.receive_all()
|
self.relay.receive_all()
|
||||||
|
|
||||||
def add_member(self, newmember):
|
def send_add_member(self, newmember):
|
||||||
assert isinstance(newmember, str)
|
assert isinstance(newmember, str)
|
||||||
self.members.add(newmember)
|
self.members.add(newmember)
|
||||||
AddMemberMessage(self, newmember=newmember).send()
|
AddMemberMessage(self, newmember=newmember).send()
|
||||||
|
|
||||||
def del_member(self, member):
|
def send_del_member(self, member):
|
||||||
assert isinstance(member, str)
|
assert isinstance(member, str)
|
||||||
assert member in self.members
|
assert member in self.members
|
||||||
msg = DelMemberMessage(self, member=member)
|
msg = DelMemberMessage(self, member=member)
|
||||||
@@ -125,12 +125,12 @@ def test_add_and_remove(relay):
|
|||||||
assert p0.members == p1.members == set([p0.id, p1.id])
|
assert p0.members == p1.members == set([p0.id, p1.id])
|
||||||
|
|
||||||
# add members
|
# add members
|
||||||
p0.add_member(p2.id)
|
p0.send_add_member(p2.id)
|
||||||
p0.add_member(p3.id)
|
p0.send_add_member(p3.id)
|
||||||
relay.receive_all()
|
relay.receive_all()
|
||||||
relay.assert_same_members()
|
relay.assert_same_members()
|
||||||
|
|
||||||
p3.del_member(p0.id)
|
p3.send_del_member(p0.id)
|
||||||
relay.receive_all()
|
relay.receive_all()
|
||||||
relay.assert_same_members()
|
relay.assert_same_members()
|
||||||
|
|
||||||
@@ -140,8 +140,8 @@ def test_concurrent_add(relay):
|
|||||||
|
|
||||||
p0.immediate_create_group([p1])
|
p0.immediate_create_group([p1])
|
||||||
# concurrent adding and then let base set send a chat message
|
# concurrent adding and then let base set send a chat message
|
||||||
p1.add_member(p2.id)
|
p1.send_add_member(p2.id)
|
||||||
p0.add_member(p3.id)
|
p0.send_add_member(p3.id)
|
||||||
|
|
||||||
# now p0 and p1 send a regular message
|
# now p0 and p1 send a regular message
|
||||||
p0.send_chatmessage()
|
p0.send_chatmessage()
|
||||||
@@ -160,7 +160,7 @@ def test_add_remove_and_stale_old_suddenly_sends(relay):
|
|||||||
p0.immediate_create_group([p1, p2, p3])
|
p0.immediate_create_group([p1, p2, p3])
|
||||||
|
|
||||||
# p3 is offline and a member get deleted
|
# p3 is offline and a member get deleted
|
||||||
p0.del_member(p2.id)
|
p0.send_del_member(p2.id)
|
||||||
relay.receive_all([p0, p1, p2])
|
relay.receive_all([p0, p1, p2])
|
||||||
|
|
||||||
# p3 sends a message with old memberlist and goes online
|
# p3 sends a message with old memberlist and goes online
|
||||||
|
|||||||
Reference in New Issue
Block a user