diff --git a/deltachat-rpc-client/tests/test_iroh_webxdc.py b/deltachat-rpc-client/tests/test_iroh_webxdc.py index 978f3298a..0eb6c15a4 100644 --- a/deltachat-rpc-client/tests/test_iroh_webxdc.py +++ b/deltachat-rpc-client/tests/test_iroh_webxdc.py @@ -84,7 +84,7 @@ def test_realtime_sequentially(acfactory, path_to_webxdc): # share a webxdc app between ac1 and ac2 ac1_webxdc_msg = acfactory.send_message(from_account=ac1, to_account=ac2, text="play", file=path_to_webxdc) - ac2_webxdc_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id) + ac2_webxdc_msg = ac2.wait_for_incoming_msg() snapshot = ac2_webxdc_msg.get_snapshot() assert snapshot.text == "play" @@ -94,7 +94,7 @@ def test_realtime_sequentially(acfactory, path_to_webxdc): acfactory.send_message(from_account=ac1, to_account=ac2, text="ping1") log("waiting for incoming message on ac2") - snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = ac2.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "ping1" log("sending ac2 -> ac1 realtime advertisement and additional message") @@ -102,7 +102,7 @@ def test_realtime_sequentially(acfactory, path_to_webxdc): acfactory.send_message(from_account=ac2, to_account=ac1, text="ping2") log("waiting for incoming message on ac1") - snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = ac1.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "ping2" log("sending realtime data ac1 -> ac2") diff --git a/deltachat-rpc-client/tests/test_securejoin.py b/deltachat-rpc-client/tests/test_securejoin.py index 780f9f419..4e9dc8836 100644 --- a/deltachat-rpc-client/tests/test_securejoin.py +++ b/deltachat-rpc-client/tests/test_securejoin.py @@ -86,7 +86,7 @@ def test_qr_securejoin(acfactory): alice_contact_bob_snapshot = alice_contact_bob.get_snapshot() assert alice_contact_bob_snapshot.is_verified - snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = bob.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr")) # Test that Bob verified Alice's profile. @@ -255,7 +255,7 @@ def test_qr_securejoin_contact_request(acfactory) -> None: alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob.send_text("Hello!") - snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = bob.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Hello!" bob_chat_alice = snapshot.chat assert bob_chat_alice.get_basic_snapshot().is_contact_request @@ -299,8 +299,7 @@ def test_qr_readreceipt(acfactory) -> None: logging.info("Bob and Charlie receive a group") - bob_msg_id = bob.wait_for_incoming_msg_event().msg_id - bob_message = bob.get_message_by_id(bob_msg_id) + bob_message = bob.wait_for_incoming_msg() bob_snapshot = bob_message.get_snapshot() assert bob_snapshot.text == "Hello" @@ -311,8 +310,7 @@ def test_qr_readreceipt(acfactory) -> None: bob_out_message = bob_snapshot.chat.send_message(text="Hi from Bob!") - charlie_msg_id = charlie.wait_for_incoming_msg_event().msg_id - charlie_message = charlie.get_message_by_id(charlie_msg_id) + charlie_message = charlie.wait_for_incoming_msg() charlie_snapshot = charlie_message.get_snapshot() assert charlie_snapshot.text == "Hi from Bob!" @@ -387,7 +385,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None: ac3_contact_ac2 = ac3.create_contact(ac2) ac3_chat.remove_contact(ac3_contact_ac2_old) - snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = ac1.wait_for_incoming_msg().get_snapshot() assert "removed" in snapshot.text ac3_chat.add_contact(ac3_contact_ac2) @@ -400,18 +398,17 @@ def test_verified_group_member_added_recovery(acfactory) -> None: logging.info("ac2 got event message: %s", snapshot.text) assert "added" in snapshot.text - snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = ac1.wait_for_incoming_msg().get_snapshot() assert "added" in snapshot.text chat = Chat(ac2, chat_id) chat.send_text("Works again!") - msg_id = ac3.wait_for_incoming_msg_event().msg_id - message = ac3.get_message_by_id(msg_id) + message = ac3.wait_for_incoming_msg() snapshot = message.get_snapshot() assert snapshot.text == "Works again!" - snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = ac1.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Works again!" ac1_contact_ac2 = ac1.create_contact(ac2) @@ -447,7 +444,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory): # ensure ac1 can write and ac2 receives messages in verified chat ch1.send_text("ac1 says hello") while 1: - snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = ac2.wait_for_incoming_msg().get_snapshot() if snapshot.text == "ac1 says hello": break @@ -468,7 +465,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory): # ensure ac2 receives message in VG vg.send_text("hello") while 1: - msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot() + msg = ac2.wait_for_incoming_msg().get_snapshot() if msg.text == "hello": break @@ -505,7 +502,7 @@ def test_qr_new_group_unblocked(acfactory): ac2.wait_for_incoming_msg_event() ac1_new_chat.send_text("Hello!") - ac2_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot() + ac2_msg = ac2.wait_for_incoming_msg().get_snapshot() assert ac2_msg.text == "Hello!" assert ac2_msg.chat.get_basic_snapshot().is_contact_request @@ -530,7 +527,7 @@ def test_aeap_flow_verified(acfactory): logging.info("receiving first message") ac2.wait_for_incoming_msg_event() # member added message - msg_in_1 = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot() + msg_in_1 = ac2.wait_for_incoming_msg().get_snapshot() assert msg_in_1.text == msg_out.text logging.info("changing email account") @@ -544,7 +541,7 @@ def test_aeap_flow_verified(acfactory): msg_out = chat.send_text("changed address").get_snapshot() logging.info("receiving second message") - msg_in_2 = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id) + msg_in_2 = ac2.wait_for_incoming_msg() msg_in_2_snapshot = msg_in_2.get_snapshot() assert msg_in_2_snapshot.text == msg_out.text assert msg_in_2_snapshot.chat.id == msg_in_1.chat.id @@ -576,7 +573,7 @@ def test_gossip_verification(acfactory) -> None: bob_group_chat.add_contact(bob_contact_carol) bob_group_chat.send_message(text="Hello Autocrypt group") - snapshot = carol.get_message_by_id(carol.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = carol.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Hello Autocrypt group" assert snapshot.show_padlock @@ -592,7 +589,7 @@ def test_gossip_verification(acfactory) -> None: bob_group_chat.add_contact(bob_contact_carol) bob_group_chat.send_message(text="Hello Securejoin group") - snapshot = carol.get_message_by_id(carol.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = carol.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Hello Securejoin group" assert snapshot.show_padlock @@ -620,7 +617,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None: ac1.wait_for_securejoin_joiner_success() # ac1 waits for member added message and creates a QR code. - snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = ac1.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Member Me added by {}.".format(ac3.get_config("addr")) ac1_qr_code = snapshot.chat.get_qr_code() @@ -657,7 +654,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None: # Wait for member added. logging.info("ac2 waits for member added message") - snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = ac2.wait_for_incoming_msg().get_snapshot() assert snapshot.is_info ac2_chat = snapshot.chat assert len(ac2_chat.get_contacts()) == 3 @@ -679,7 +676,7 @@ def test_withdraw_securejoin_qr(acfactory): alice.clear_all_events() - snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = bob.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr")) bob_chat.leave() diff --git a/deltachat-rpc-client/tests/test_something.py b/deltachat-rpc-client/tests/test_something.py index 6f888c28b..8e882896e 100644 --- a/deltachat-rpc-client/tests/test_something.py +++ b/deltachat-rpc-client/tests/test_something.py @@ -352,9 +352,7 @@ def test_receive_imf_failure(acfactory) -> None: # The failed message doesn't break the IMAP loop. bob.set_config("fail_on_receiving_full_msg", "0") alice_chat_bob.send_text("Hello again!") - event = bob.wait_for_incoming_msg_event() - msg_id = event.msg_id - message = bob.get_message_by_id(msg_id) + message = bob.wait_for_incoming_msg() snapshot = message.get_snapshot() assert snapshot.text == "Hello again!" assert snapshot.download_state == DownloadState.DONE @@ -423,10 +421,7 @@ def test_is_bot(acfactory) -> None: alice.set_config("bot", "1") alice_chat_bob.send_text("Hello!") - event = bob.wait_for_incoming_msg_event() - message = bob.get_message_by_id(event.msg_id) - snapshot = message.get_snapshot() - assert snapshot.chat_id == event.chat_id + snapshot = bob.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Hello!" assert snapshot.is_bot @@ -518,7 +513,7 @@ def test_import_export_keys(acfactory, tmp_path) -> None: alice_chat_bob = alice.create_chat(bob) alice_chat_bob.send_text("Hello Bob!") - snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = bob.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Hello Bob!" # Alice resetups account, but keeps the key. @@ -530,7 +525,7 @@ def test_import_export_keys(acfactory, tmp_path) -> None: snapshot.chat.accept() snapshot.chat.send_text("Hello Alice!") - snapshot = alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = alice.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "Hello Alice!" assert snapshot.show_padlock @@ -575,18 +570,13 @@ def test_mdn_doesnt_break_autocrypt(acfactory) -> None: # Alice sends a message to Bob. alice_chat_bob.send_text("Hello Bob!") - event = bob.wait_for_incoming_msg_event() - msg_id = event.msg_id - message = bob.get_message_by_id(msg_id) - snapshot = message.get_snapshot() + snapshot = bob.wait_for_incoming_msg().get_snapshot() # Bob sends a message to Alice. bob_chat_alice = snapshot.chat bob_chat_alice.accept() bob_chat_alice.send_text("Hello Alice!") - event = alice.wait_for_incoming_msg_event() - msg_id = event.msg_id - message = alice.get_message_by_id(msg_id) + message = alice.wait_for_incoming_msg() snapshot = message.get_snapshot() assert snapshot.show_padlock @@ -596,10 +586,7 @@ def test_mdn_doesnt_break_autocrypt(acfactory) -> None: # Bob sends a message to Alice, it should also be encrypted. bob_chat_alice.send_text("Hi Alice!") - event = alice.wait_for_incoming_msg_event() - msg_id = event.msg_id - message = alice.get_message_by_id(msg_id) - snapshot = message.get_snapshot() + snapshot = alice.wait_for_incoming_msg().get_snapshot() assert snapshot.show_padlock @@ -668,7 +655,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts): for account in others: chat = account.create_chat(alice) chat.send_text("Hello Alice!") - assert alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot().text == "Hello Alice!" + assert alice.wait_for_incoming_msg().get_snapshot().text == "Hello Alice!" contact = alice.create_contact(account) alice_group.add_contact(contact) @@ -678,7 +665,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts): bob.set_config("download_limit", str(download_limit)) alice_group.send_text("hi") - snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = bob.wait_for_incoming_msg().get_snapshot() assert snapshot.text == "hi" bob_group = snapshot.chat @@ -688,7 +675,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts): for i in range(10): logging.info("Sending message %s", i) alice_group.send_file(str(path)) - snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot() + snapshot = bob.wait_for_incoming_msg().get_snapshot() assert snapshot.download_state == DownloadState.AVAILABLE if n_accounts > 2: assert snapshot.chat == bob_group @@ -715,8 +702,8 @@ def test_markseen_contact_request(acfactory): alice_chat_bob = alice.create_chat(bob) alice_chat_bob.send_text("Hello Bob!") - message = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id) - message2 = bob2.get_message_by_id(bob2.wait_for_incoming_msg_event().msg_id) + message = bob.wait_for_incoming_msg() + message2 = bob2.wait_for_incoming_msg() assert message2.get_snapshot().state == MessageState.IN_FRESH message.mark_seen()