Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-09-22 13:01:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adapt JsonRPC tests

Browse Source
This commit is contained in:
Hocuri
2026-09-21 22:26:30 +02:00
parent 96970fb08e
commit 4ce2d56908
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
deltachat-rpc-client/tests/test_securejoin.py
View File

@@ -146,17 +146,13 @@ def test_qr_securejoin_broadcast(acf, all_devices_online):
assert "invited you to join this channel" in first_msg.text assert "invited you to join this channel" in first_msg.text
assert first_msg.is_info assert first_msg.is_info
if inviter_side: if not inviter_side:
member_added_msg = chat_msgs.pop(0).get_snapshot()
assert member_added_msg.text == f"Member {contact_snapshot.display_name} added."
assert member_added_msg.info_contact_id == contact_snapshot.id
else:
if chat_msgs[0].get_snapshot().text == "You joined the channel.": if chat_msgs[0].get_snapshot().text == "You joined the channel.":
member_added_msg = chat_msgs.pop(0).get_snapshot() member_added_msg = chat_msgs.pop(0).get_snapshot()
else: else:
member_added_msg = chat_msgs.pop(1).get_snapshot() member_added_msg = chat_msgs.pop(1).get_snapshot()
assert member_added_msg.text == "You joined the channel." assert member_added_msg.text == "You joined the channel."
assert member_added_msg.is_info assert member_added_msg.is_info
hello_msg = chat_msgs.pop(0).get_snapshot() hello_msg = chat_msgs.pop(0).get_snapshot()
assert hello_msg.text == "Hello everyone!" assert hello_msg.text == "Hello everyone!"
@@ -221,7 +217,7 @@ def test_qr_securejoin_broadcast(acf, all_devices_online):
snapshot = fiona.wait_for_incoming_msg().get_snapshot() snapshot = fiona.wait_for_incoming_msg().get_snapshot()
assert snapshot.text == "You joined the channel." assert snapshot.text == "You joined the channel."
get_broadcast(alice2).get_messages()[2].resend() get_broadcast(alice2).get_messages()[1].resend()
snapshot = fiona.wait_for_incoming_msg().get_snapshot() snapshot = fiona.wait_for_incoming_msg().get_snapshot()
assert snapshot.text == "Hello everyone!" assert snapshot.text == "Hello everyone!"

12
deltachat-rpc-client/tests/test_something.py
View File

@@ -1187,7 +1187,6 @@ def test_leave_broadcast(acf, all_devices_online):
def check_account(ac, contact, inviter_side, please_wait_info_msg=False): def check_account(ac, contact, inviter_side, please_wait_info_msg=False):
chat = get_broadcast(ac) chat = get_broadcast(ac)
contact_snapshot = contact.get_snapshot()
chat_msgs = chat.get_messages() chat_msgs = chat.get_messages()
encrypted_msg = chat_msgs.pop(0).get_snapshot() encrypted_msg = chat_msgs.pop(0).get_snapshot()
@@ -1199,14 +1198,11 @@ def test_leave_broadcast(acf, all_devices_online):
assert "invited you to join this channel" in first_msg.text assert "invited you to join this channel" in first_msg.text
assert first_msg.is_info assert first_msg.is_info
member_added_msg = chat_msgs.pop(0).get_snapshot()
if inviter_side:
assert member_added_msg.text == f"Member {contact_snapshot.display_name} added."
else:
assert member_added_msg.text == "You joined the channel."
assert member_added_msg.is_info
if not inviter_side: if not inviter_side:
member_added_msg = chat_msgs.pop(0).get_snapshot()
assert member_added_msg.text == "You joined the channel."
assert member_added_msg.is_info
leave_msg = chat_msgs.pop(0).get_snapshot() leave_msg = chat_msgs.pop(0).get_snapshot()
assert leave_msg.text == "You left the channel." assert leave_msg.text == "You left the channel."