Skip to content

test: Fix flaky test_qr_securejoin_broadcast #7937

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.

Sign up for GitHub

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

Merged
Hocuri merged 1 commit into from
Mar 3, 2026
Merged

test: Fix flaky test_qr_securejoin_broadcast #7937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions deltachat-rpc-client/tests/test_securejoin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def wait_for_broadcast_messages(ac):
assert snapshot1.chat_id == chat.id
assert snapshot2.chat_id == chat.id

def check_account(ac, contact, inviter_side, please_wait_info_msg=False, resent_msg=False):
def check_account(ac, contact, inviter_side, please_wait_info_msg=False):
# Check that the chat partner is verified.
contact_snapshot = contact.get_snapshot()
assert contact_snapshot.is_verified
Expand All @@ -172,8 +172,11 @@ def check_account(ac, contact, inviter_side, please_wait_info_msg=False, resent_
assert member_added_msg.text == f"Member {contact_snapshot.display_name} added."
assert member_added_msg.info_contact_id == contact_snapshot.id
else:
member_added_msg = chat_msgs.pop(1 if resent_msg else 0).get_snapshot()
assert member_added_msg.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()
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

hello_msg = chat_msgs.pop(0).get_snapshot()
Expand Down Expand Up @@ -243,7 +246,7 @@ def check_account(ac, contact, inviter_side, please_wait_info_msg=False, resent_
snapshot = fiona.wait_for_incoming_msg().get_snapshot()
assert snapshot.text == "Hello everyone!"

check_account(fiona, fiona.create_contact(alice), inviter_side=False, please_wait_info_msg=True, resent_msg=True)
check_account(fiona, fiona.create_contact(alice), inviter_side=False, please_wait_info_msg=True)

# For Bob, the channel must not have changed:
check_account(bob, bob.create_contact(alice), inviter_side=False, please_wait_info_msg=True)
Expand Down