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

test: encrypt legacy Python tests

Browse Source 
This makes it possible to run Python tests
against chatmail servers that don't allow
any unencrypted messages.
This commit is contained in:
link2xt
2025-04-01 19:54:41 +00:00
parent b56cf72c87
commit 0e874735ac
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/src/deltachat/account.py
View File

@@ -280,6 +280,12 @@ class Account:
:param name: (optional) display name for this contact :param name: (optional) display name for this contact
:returns: :class:`deltachat.contact.Contact` instance. :returns: :class:`deltachat.contact.Contact` instance.
""" """
if isinstance(obj, Account):
if not obj.is_configured():
raise ValueError("Can only add configured accounts as contacts")
assert name is None
vcard = obj.get_self_contact().make_vcard()
return self.import_vcard(vcard)[0]
(name, addr) = self.get_contact_addr_and_name(obj, name) (name, addr) = self.get_contact_addr_and_name(obj, name)
name_c = as_dc_charpointer(name) name_c = as_dc_charpointer(name)
addr_c = as_dc_charpointer(addr) addr_c = as_dc_charpointer(addr)

10
python/tests/test_1_online.py
View File

@@ -860,7 +860,7 @@ def test_send_first_message_as_long_unicode_with_cr(acfactory, lp):
" wrapped using format=flowed and unwrapped on the receiver" " wrapped using format=flowed and unwrapped on the receiver"
) )
msg_out = chat.send_text(text1) msg_out = chat.send_text(text1)
assert not msg_out.is_encrypted() assert msg_out.is_encrypted()
lp.sec("wait for ac2 to receive multi-line non-unicode message") lp.sec("wait for ac2 to receive multi-line non-unicode message")
msg_in = ac2._evtracker.wait_next_incoming_message() msg_in = ac2._evtracker.wait_next_incoming_message()
@@ -869,7 +869,7 @@ def test_send_first_message_as_long_unicode_with_cr(acfactory, lp):
lp.sec("sending multi-line unicode text message from ac1 to ac2") lp.sec("sending multi-line unicode text message from ac1 to ac2")
text2 = "äalis\nthis is ßßÄ" text2 = "äalis\nthis is ßßÄ"
msg_out = chat.send_text(text2) msg_out = chat.send_text(text2)
assert not msg_out.is_encrypted() assert msg_out.is_encrypted()
lp.sec("wait for ac2 to receive multi-line unicode message") lp.sec("wait for ac2 to receive multi-line unicode message")
msg_in = ac2._evtracker.wait_next_incoming_message() msg_in = ac2._evtracker.wait_next_incoming_message()
@@ -1374,7 +1374,7 @@ def test_add_remove_member_remote_events(acfactory, lp):
lp.sec("ac1: add address2") lp.sec("ac1: add address2")
# note that if the above create_chat() would not # note that if the above create_chat() would not
# happen we would not receive a proper member_added event # happen we would not receive a proper member_added event
contact2 = chat.add_contact(ac3_addr) contact2 = chat.add_contact(ac3)
ev = in_list.get() ev = in_list.get()
assert ev.action == "chat-modified" assert ev.action == "chat-modified"
ev = in_list.get() ev = in_list.get()
@@ -1814,9 +1814,7 @@ def test_name_changes(acfactory):
ac1, ac2 = acfactory.get_online_accounts(2) ac1, ac2 = acfactory.get_online_accounts(2)
ac1.set_config("displayname", "Account 1") ac1.set_config("displayname", "Account 1")
# Similar to acfactory.get_accepted_chat, but without setting the contact name. chat12 = acfactory.get_accepted_chat(ac1, ac2)
ac2.create_contact(ac1.get_config("addr")).create_chat()
chat12 = ac1.create_contact(ac2.get_config("addr")).create_chat()
contact = None contact = None
def update_name(): def update_name():