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

enhance waiting for direct imap idle events to prevent randomness

Browse Source
This commit is contained in:
holger krekel
2022-04-19 10:25:01 +02:00
parent dfbfd4fe74
commit 801d636eb5
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/src/deltachat/direct_imap.py
View File

@@ -230,7 +230,15 @@ class DirectImap:
self.account.log("imap-direct: idle_check returned {!r}".format(res)) self.account.log("imap-direct: idle_check returned {!r}".format(res))
return res return res
def idle_wait_for_seen(self): def idle_wait_for_new_message(self, terminate=False):
while 1:
for item in self.idle_check():
if item[1] in (b'EXISTS', b'RECENT'):
if terminate:
self.idle_done()
return item
def idle_wait_for_seen(self, terminate=False):
""" Return first message with SEEN flag """ Return first message with SEEN flag
from a running idle-stream REtiurn. from a running idle-stream REtiurn.
""" """
@@ -239,6 +247,8 @@ class DirectImap:
if item[1] == FETCH: if item[1] == FETCH:
if item[2][0] == FLAGS: if item[2][0] == FLAGS:
if SEEN in item[2][1]: if SEEN in item[2][1]:
if terminate:
self.idle_done()
return item[0] return item[0]
def idle_done(self): def idle_done(self):

24
python/tests/test_account.py
View File

@@ -1013,7 +1013,7 @@ class TestOnlineAccount:
assert ev.data1 == msg2.chat.id assert ev.data1 == msg2.chat.id
assert ev.data2 == 0 assert ev.data2 == 0
ac2.direct_imap.idle_check(terminate=True) ac2.direct_imap.idle_wait_for_new_message(terminate=True)
lp.step("1") lp.step("1")
for i in range(2): for i in range(2):
ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ") ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ")
@@ -1044,8 +1044,7 @@ class TestOnlineAccount:
ac1.create_chat(ac2).send_text("Hello!") ac1.create_chat(ac2).send_text("Hello!")
# Wait for the message to arrive. ac2.direct_imap.idle_wait_for_new_message(terminate=True)
ac2.direct_imap.idle_check(terminate=True)
# Emulate moving of the message to DeltaChat folder by Sieve rule. # Emulate moving of the message to DeltaChat folder by Sieve rule.
# mailcow server contains this rule by default. # mailcow server contains this rule by default.
@@ -1059,8 +1058,7 @@ class TestOnlineAccount:
# Accept the contact request. # Accept the contact request.
msg.chat.accept() msg.chat.accept()
ac2.mark_seen_messages([msg]) ac2.mark_seen_messages([msg])
ac2.direct_imap.idle_wait_for_seen() ac2.direct_imap.idle_wait_for_seen(terminate=True)
ac2.direct_imap.idle_done()
fetch = list(ac2.direct_imap.conn.fetch("*", b'FLAGS').values()) fetch = list(ac2.direct_imap.conn.fetch("*", b'FLAGS').values())
flags = fetch[-1][b'FLAGS'] flags = fetch[-1][b'FLAGS']
@@ -2211,7 +2209,7 @@ class TestOnlineAccount:
ac1.direct_imap.idle_start() ac1.direct_imap.idle_start()
ac2.create_chat(ac1).send_text("Hi") ac2.create_chat(ac1).send_text("Hi")
ac1.direct_imap.idle_check(terminate=False) ac1.direct_imap.idle_wait_for_new_message(terminate=False)
ac1.maybe_network() ac1.maybe_network()
ac1._evtracker.wait_for_all_work_done() ac1._evtracker.wait_for_all_work_done()
@@ -2223,7 +2221,7 @@ class TestOnlineAccount:
ac2.create_chat(ac1).send_text("Hi 2") ac2.create_chat(ac1).send_text("Hi 2")
ac1.direct_imap.idle_check(terminate=True) ac1.direct_imap.idle_wait_for_new_message(terminate=True)
ac1.maybe_network() ac1.maybe_network()
ac1._evtracker.wait_for_connectivity_change(const.DC_CONNECTIVITY_CONNECTED, const.DC_CONNECTIVITY_WORKING) ac1._evtracker.wait_for_connectivity_change(const.DC_CONNECTIVITY_CONNECTED, const.DC_CONNECTIVITY_WORKING)
ac1._evtracker.wait_for_connectivity_change(const.DC_CONNECTIVITY_WORKING, const.DC_CONNECTIVITY_CONNECTED) ac1._evtracker.wait_for_connectivity_change(const.DC_CONNECTIVITY_WORKING, const.DC_CONNECTIVITY_CONNECTED)
@@ -2248,7 +2246,7 @@ class TestOnlineAccount:
ac1.direct_imap.idle_start() ac1.direct_imap.idle_start()
ac2.create_chat(ac1).send_text("Hi") ac2.create_chat(ac1).send_text("Hi")
ac1.direct_imap.idle_check(terminate=True) ac1.direct_imap.idle_wait_for_new_message(terminate=True)
ac1.maybe_network() ac1.maybe_network()
while 1: while 1:
@@ -2446,7 +2444,7 @@ class TestOnlineAccount:
ac2.create_chat(ac1) ac2.create_chat(ac1)
sent_msg = chat1.send_text("hello") sent_msg = chat1.send_text("hello")
imap2.idle_check(terminate=False) imap2.idle_wait_for_new_message(terminate=False)
msg = ac2._evtracker.wait_next_incoming_message() msg = ac2._evtracker.wait_next_incoming_message()
assert msg.text == "hello" assert msg.text == "hello"
@@ -2717,13 +2715,7 @@ class TestOnlineAccount:
ac1.direct_imap.select_config_folder("inbox") ac1.direct_imap.select_config_folder("inbox")
ac1.direct_imap.idle_start() ac1.direct_imap.idle_start()
acfactory.get_accepted_chat(ac2, ac1).send_text("hello") acfactory.get_accepted_chat(ac2, ac1).send_text("hello")
while True: ac1.direct_imap.idle_wait_for_new_message(terminate=True)
if len(ac1.direct_imap.idle_check(terminate=True)) > 1:
# If length is 1, it's [(b'OK', b'Still here')]
# Could happen on very slow network.
#
# More is usually [(1, b'EXISTS'), (1, b'RECENT')]
break
ac1.direct_imap.conn.move(["*"], folder) # "*" means "biggest UID in mailbox" ac1.direct_imap.conn.move(["*"], folder) # "*" means "biggest UID in mailbox"
lp.sec("Everything prepared, now see if DeltaChat finds the message (" + variant + ")") lp.sec("Everything prepared, now see if DeltaChat finds the message (" + variant + ")")