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

fix ordering issues with test_forward_increation

Browse Source
This commit is contained in:
holger krekel
2020-05-22 12:24:52 +02:00
parent da7db04c0e
commit 7c8758dc26
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
python/tests/test_increation.py
View File

@@ -9,15 +9,29 @@ from filecmp import cmp
from deltachat import const from deltachat import const
def wait_msg_delivered(account, msg_list):
while msg_list:
ev = account._evtracker.get_matching("DC_EVENT_MSG_DELIVERED")
msg_list.remove((ev.data1, ev.data2))
def get_msgs_changed(account):
while 1:
ev = account._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
yield (ev.data1, ev.data2)
def wait_msgs_changed(account, chat_id, msg_id=None): def wait_msgs_changed(account, chat_id, msg_id=None):
account.log("waiting for chat_id={} msg_id={}".format(chat_id, msg_id)) account.log("waiting for chat_id={} msg_id={}".format(chat_id, msg_id))
while 1: while 1:
ev = account._evtracker.get_matching("DC_EVENT_MSGS_CHANGED") ev = account._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
if ev.data1 != chat_id: if ev.data1 != chat_id:
account.log("waiting got mismatched DC_EVENT_MSGS_CHANGED") account.log("waiting got mismatched DC_EVENT_MSGS_CHANGED")
account.log("expect chat_id={} got data1={}".format(chat_id, ev.data1))
continue continue
if msg_id is not None: if msg_id is not None:
assert ev.data2 == msg_id assert ev.data2 == msg_id
account.log("WAIT -> FOUND chat_id={} msg_id={}".format(chat_id, msg_id))
return ev.data2 return ev.data2
@@ -85,20 +99,24 @@ class TestOnlineInCreation:
shutil.copyfile(orig, path) shutil.copyfile(orig, path)
chat.send_prepared(prepared_original) chat.send_prepared(prepared_original)
assert prepared_original.is_out_pending() or prepared_original.is_out_delivered() assert prepared_original.is_out_pending() or prepared_original.is_out_delivered()
wait_msgs_changed(ac1, chat.id, prepared_original.id)
lp.sec("expect the forwarded message to be sent now too") lp.sec("check that both forwarded and original message are proper.")
wait_msgs_changed(ac1, chat2.id, forwarded_id) forwarded, original = False, False
fwd_msg = ac1.get_message_by_id(forwarded_id) for chat_id, msg_id in get_msgs_changed(ac1):
assert fwd_msg.is_out_pending() or fwd_msg.is_out_delivered() if chat_id == chat2.id and msg_id == forwarded_id:
forwarded = True
fwd_msg = ac1.get_message_by_id(forwarded_id)
assert fwd_msg.is_out_pending() or fwd_msg.is_out_delivered()
elif chat_id == chat.id and msg_id == prepared_original.id:
original = True
if forwarded and original:
break
lp.sec("wait for the messages to be delivered to SMTP") lp.sec("wait for both messages to be delivered to SMTP")
ev = ac1._evtracker.get_matching("DC_EVENT_MSG_DELIVERED") wait_msg_delivered(ac1, [
assert ev.data1 == chat.id (chat2.id, forwarded_id),
assert ev.data2 == prepared_original.id (chat.id, prepared_original.id)
ev = ac1._evtracker.get_matching("DC_EVENT_MSG_DELIVERED") ])
assert ev.data1 == chat2.id
assert ev.data2 == forwarded_id
lp.sec("wait1 for original or forwarded messages to arrive") lp.sec("wait1 for original or forwarded messages to arrive")
ev1 = ac2._evtracker.get_matching("DC_EVENT_MSGS_CHANGED") ev1 = ac2._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")