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

another round of python3.5 fixes and retagging

Browse Source
This commit is contained in:
holger krekel
2021-02-13 15:45:31 +01:00
parent c3232e6d8f
commit a83293102e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/tests/test_account.py
View File

@@ -1142,7 +1142,8 @@ class TestOnlineAccount:
lp.sec("ac3 does not know that ac1 prefers encryption") lp.sec("ac3 does not know that ac1 prefers encryption")
ac1.create_chat(ac3) ac1.create_chat(ac3)
chat = ac3.create_chat(ac1) chat = ac3.create_chat(ac1)
assert chat.get_encryption_info() == f"{ac1.get_config('addr')} No encryption." res = "{} No encryption.".format(ac1.get_config('addr'))
assert chat.get_encryption_info() == res
msg = chat.send_text("not encrypted") msg = chat.send_text("not encrypted")
msg = ac1._evtracker.wait_next_incoming_message() msg = ac1._evtracker.wait_next_incoming_message()
assert msg.text == "not encrypted" assert msg.text == "not encrypted"
@@ -1152,7 +1153,8 @@ class TestOnlineAccount:
group_chat = ac1.create_group_chat("hello") group_chat = ac1.create_group_chat("hello")
group_chat.add_contact(ac2) group_chat.add_contact(ac2)
encryption_info = group_chat.get_encryption_info() encryption_info = group_chat.get_encryption_info()
assert encryption_info == f"{ac2.get_config('addr')} End-to-end encryption preferred." res = "{} End-to-end encryption preferred.".format(ac2.get_config("addr"))
assert encryption_info == res
msg = group_chat.send_text("hi") msg = group_chat.send_text("hi")
msg = ac2._evtracker.wait_next_incoming_message() msg = ac2._evtracker.wait_next_incoming_message()
@@ -1166,8 +1168,10 @@ class TestOnlineAccount:
lp.sec("ac3 learns that ac1 prefers encryption") lp.sec("ac3 learns that ac1 prefers encryption")
msg = ac3._evtracker.wait_next_incoming_message() msg = ac3._evtracker.wait_next_incoming_message()
encryption_info = msg.chat.get_encryption_info().splitlines() encryption_info = msg.chat.get_encryption_info().splitlines()
assert f"{ac1.get_config('addr')} End-to-end encryption preferred." in encryption_info res = "{} End-to-end encryption preferred.".format(ac1.get_config("addr"))
assert f"{ac2.get_config('addr')} End-to-end encryption preferred." in encryption_info assert res in encryption_info
res = "{} End-to-end encryption preferred.".format(ac2.get_config("addr"))
assert res in encryption_info
msg = chat.send_text("encrypted") msg = chat.send_text("encrypted")
assert msg.is_encrypted() assert msg.is_encrypted()