From 4ce2d5690894ac17aec6a47a234d96b249a15781 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Mon, 21 Sep 2026 22:26:30 +0200 Subject: [PATCH] Adapt JsonRPC tests --- deltachat-rpc-client/tests/test_securejoin.py | 10 +++------- deltachat-rpc-client/tests/test_something.py | 12 ++++-------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/deltachat-rpc-client/tests/test_securejoin.py b/deltachat-rpc-client/tests/test_securejoin.py index 15664c734..cece31424 100644 --- a/deltachat-rpc-client/tests/test_securejoin.py +++ b/deltachat-rpc-client/tests/test_securejoin.py @@ -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 first_msg.is_info - if 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 not inviter_side: if chat_msgs[0].get_snapshot().text == "You joined the channel.": member_added_msg = chat_msgs.pop(0).get_snapshot() else: member_added_msg = chat_msgs.pop(1).get_snapshot() 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() 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() 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() assert snapshot.text == "Hello everyone!" diff --git a/deltachat-rpc-client/tests/test_something.py b/deltachat-rpc-client/tests/test_something.py index 541497a83..01ad5778a 100644 --- a/deltachat-rpc-client/tests/test_something.py +++ b/deltachat-rpc-client/tests/test_something.py @@ -1187,7 +1187,6 @@ def test_leave_broadcast(acf, all_devices_online): def check_account(ac, contact, inviter_side, please_wait_info_msg=False): chat = get_broadcast(ac) - contact_snapshot = contact.get_snapshot() chat_msgs = chat.get_messages() 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 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: + 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() assert leave_msg.text == "You left the channel."