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

test: use vCards more in Python tests

Browse Source
This commit is contained in:
link2xt
2025-03-22 14:06:51 +00:00
committed by l
parent e4e738ec5f
commit d25fb4770c
3 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deltachat-rpc-client/tests/test_chatlist_events.py
View File

@@ -48,8 +48,7 @@ def test_delivery_status(acfactory: ACFactory) -> None:
""" """
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
alice.clear_all_events() alice.clear_all_events()
@@ -119,8 +118,7 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
""" """
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
alice_chat_bob.send_text("hi") alice_chat_bob.send_text("hi")
@@ -150,8 +148,7 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
def get_multi_account_test_setup(acfactory: ACFactory) -> [Account, Account, Account]: def get_multi_account_test_setup(acfactory: ACFactory) -> [Account, Account, Account]:
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
alice_chat_bob.send_text("hi") alice_chat_bob.send_text("hi")

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

@@ -117,8 +117,7 @@ def test_qr_securejoin_contact_request(acfactory) -> None:
"""Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode.""" """Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode."""
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
alice_chat_bob.send_text("Hello!") alice_chat_bob.send_text("Hello!")
@@ -155,11 +154,8 @@ def test_qr_readreceipt(acfactory) -> None:
logging.info("Alice creates a verified group") logging.info("Alice creates a verified group")
group = alice.create_group("Group", protect=True) group = alice.create_group("Group", protect=True)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
charlie_addr = charlie.get_config("addr") alice_contact_charlie = alice.create_contact(charlie, "Charlie")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_contact_charlie = alice.create_contact(charlie_addr, "Charlie")
group.add_contact(alice_contact_bob) group.add_contact(alice_contact_bob)
group.add_contact(alice_contact_charlie) group.add_contact(alice_contact_charlie)
@@ -186,7 +182,7 @@ def test_qr_readreceipt(acfactory) -> None:
charlie_snapshot = charlie_message.get_snapshot() charlie_snapshot = charlie_message.get_snapshot()
assert charlie_snapshot.text == "Hi from Bob!" assert charlie_snapshot.text == "Hi from Bob!"
bob_contact_charlie = bob.create_contact(charlie_addr, "Charlie") bob_contact_charlie = bob.create_contact(charlie, "Charlie")
assert not bob.get_chat_by_contact(bob_contact_charlie) assert not bob.get_chat_by_contact(bob_contact_charlie)
logging.info("Charlie reads Bob's message") logging.info("Charlie reads Bob's message")
@@ -517,9 +513,9 @@ def test_gossip_verification(acfactory) -> None:
bob.secure_join(qr_code) bob.secure_join(qr_code)
bob.wait_for_securejoin_joiner_success() bob.wait_for_securejoin_joiner_success()
bob_contact_alice = bob.create_contact(alice.get_config("addr"), "Alice") bob_contact_alice = bob.create_contact(alice, "Alice")
bob_contact_carol = bob.create_contact(carol.get_config("addr"), "Carol") bob_contact_carol = bob.create_contact(carol, "Carol")
carol_contact_alice = carol.create_contact(alice.get_config("addr"), "Alice") carol_contact_alice = carol.create_contact(alice, "Alice")
logging.info("Bob creates an Autocrypt group") logging.info("Bob creates an Autocrypt group")
bob_group_chat = bob.create_group("Autocrypt Group") bob_group_chat = bob.create_group("Autocrypt Group")
@@ -579,7 +575,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
ac2.wait_for_securejoin_joiner_success() ac2.wait_for_securejoin_joiner_success()
# ac1 is verified for ac2. # ac1 is verified for ac2.
ac2_contact_ac1 = ac2.create_contact(ac1.get_config("addr"), "") ac2_contact_ac1 = ac2.create_contact(ac1, "")
assert ac2_contact_ac1.get_snapshot().is_verified assert ac2_contact_ac1.get_snapshot().is_verified
# ac1 resetups the account. # ac1 resetups the account.
@@ -594,7 +590,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
# header sent by old ac1. # header sent by old ac1.
while True: while True:
# ac1 sends a message to ac2. # ac1 sends a message to ac2.
ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "") ac1_contact_ac2 = ac1.create_contact(ac2, "")
ac1_chat_ac2 = ac1_contact_ac2.create_chat() ac1_chat_ac2 = ac1_contact_ac2.create_chat()
ac1_chat_ac2.send_text("Hello!") ac1_chat_ac2.send_text("Hello!")

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

@@ -106,7 +106,7 @@ def test_account(acfactory) -> None:
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") bob_addr = bob.get_config("addr")
alice_contact_bob = alice.create_contact(bob_addr, "Bob") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
alice_chat_bob.send_text("Hello!") alice_chat_bob.send_text("Hello!")
@@ -171,8 +171,7 @@ def test_account(acfactory) -> None:
def test_chat(acfactory) -> None: def test_chat(acfactory) -> None:
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
alice_chat_bob.send_text("Hello!") alice_chat_bob.send_text("Hello!")
@@ -238,7 +237,7 @@ def test_contact(acfactory) -> None:
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") bob_addr = bob.get_config("addr")
alice_contact_bob = alice.create_contact(bob_addr, "Bob") alice_contact_bob = alice.create_contact(bob, "Bob")
assert alice_contact_bob == alice.get_contact_by_id(alice_contact_bob.id) assert alice_contact_bob == alice.get_contact_by_id(alice_contact_bob.id)
assert repr(alice_contact_bob) assert repr(alice_contact_bob)
@@ -255,8 +254,7 @@ def test_contact(acfactory) -> None:
def test_message(acfactory) -> None: def test_message(acfactory) -> None:
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
alice_chat_bob.send_text("Hello!") alice_chat_bob.send_text("Hello!")
@@ -314,8 +312,7 @@ def test_reaction_seen_on_another_dev(acfactory) -> None:
alice2 = alice.clone() alice2 = alice.clone()
alice2.start_io() alice2.start_io()
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
alice_chat_bob.send_text("Hello!") alice_chat_bob.send_text("Hello!")
@@ -332,8 +329,7 @@ def test_reaction_seen_on_another_dev(acfactory) -> None:
alice2.clear_all_events() alice2.clear_all_events()
alice_chat_bob.mark_noticed() alice_chat_bob.mark_noticed()
chat_id = alice2.wait_for_event(EventType.MSGS_NOTICED).chat_id chat_id = alice2.wait_for_event(EventType.MSGS_NOTICED).chat_id
alice2_contact_bob = alice2.get_contact_by_addr(bob_addr) alice2_chat_bob = alice2.create_chat(bob)
alice2_chat_bob = alice2_contact_bob.create_chat()
assert chat_id == alice2_chat_bob.id assert chat_id == alice2_chat_bob.id
@@ -341,8 +337,7 @@ def test_is_bot(acfactory) -> None:
"""Test that we can recognize messages submitted by bots.""" """Test that we can recognize messages submitted by bots."""
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
# Alice becomes a bot. # Alice becomes a bot.
@@ -412,8 +407,7 @@ def test_wait_next_messages(acfactory) -> None:
# Bot starts waiting for messages. # Bot starts waiting for messages.
next_messages_task = executor.submit(bot.wait_next_messages) next_messages_task = executor.submit(bot.wait_next_messages)
bot_addr = bot.get_config("addr") alice_contact_bot = alice.create_contact(bot, "Bot")
alice_contact_bot = alice.create_contact(bot_addr, "Bot")
alice_chat_bot = alice_contact_bot.create_chat() alice_chat_bot = alice_contact_bot.create_chat()
alice_chat_bot.send_text("Hello!") alice_chat_bot.send_text("Hello!")
@@ -437,9 +431,7 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
def test_import_export_keys(acfactory, tmp_path) -> None: def test_import_export_keys(acfactory, tmp_path) -> None:
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_chat_bob = alice.create_chat(bob)
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
alice_chat_bob = alice_contact_bob.create_chat()
alice_chat_bob.send_text("Hello 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.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
@@ -489,9 +481,7 @@ def test_provider_info(rpc) -> None:
def test_mdn_doesnt_break_autocrypt(acfactory) -> None: def test_mdn_doesnt_break_autocrypt(acfactory) -> None:
alice, bob = acfactory.get_online_accounts(2) alice, bob = acfactory.get_online_accounts(2)
bob_addr = bob.get_config("addr") alice_contact_bob = alice.create_contact(bob, "Bob")
alice_contact_bob = alice.create_contact(bob_addr, "Bob")
# Bob creates chat manually so chat with Alice is accepted. # Bob creates chat manually so chat with Alice is accepted.
alice_chat_bob = alice_contact_bob.create_chat() alice_chat_bob = alice_contact_bob.create_chat()
@@ -633,9 +623,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
chat.send_text("Hello 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.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot().text == "Hello Alice!"
contact_addr = account.get_config("addr") contact = alice.create_contact(account)
contact = alice.create_contact(contact_addr, "")
alice_group.add_contact(contact) alice_group.add_contact(contact)
if n_accounts == 2: if n_accounts == 2: