Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-06 07:32:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

refine waiting for initial startup waiting for "INBOX: Idle" ready

Browse Source 
this slows down initialization for tests but provides more stability in my runs
This commit is contained in:
holger krekel
2022-04-30 16:13:49 +02:00
parent 720c1b5eca
commit 5e39a13bf6
3 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/src/deltachat/events.py
View File

@@ -156,14 +156,14 @@ class FFIEventTracker:
print("** SECUREJOINT-INVITER PROGRESS {}".format(target), self.account)
break
def wait_all_initial_fetches(self):
def wait_idle_inbox_ready(self):
"""Has to be called after start_io() to wait for fetch_existing_msgs to run
so that new messages are not mistaken for old ones:
- ac1 and ac2 are created
- ac1 sends a message to ac2
- ac2 is still running FetchExsistingMsgs job and thinks it's an existing, old message
- therefore no DC_EVENT_INCOMING_MSG is sent"""
self.get_info_contains("Done fetching existing messages")
self.get_info_contains("INBOX: Idle entering")
def wait_next_incoming_message(self):
""" wait for and return next incoming message. """

33
python/src/deltachat/testplugin.py
View File

@@ -332,19 +332,21 @@ class ACFactory:
def get_one_online_account(self, move=False):
ac1 = self.get_online_configuring_account(move=move)
self.wait_configure_and_start_io([ac1])
self.wait_configure_and_start_io()
return ac1
def get_two_online_accounts(self, move=False, quiet=False):
ac1 = self.get_online_configuring_account(move=move, quiet=quiet)
ac2 = self.get_online_configuring_account(quiet=quiet)
self.wait_configure_and_start_io([ac1, ac2])
self.wait_configure_and_start_io()
return ac1, ac2
def get_many_online_accounts(self, num, move=True):
accounts = [self.get_online_configuring_account(move=move, quiet=True)
for i in range(num)]
self.wait_configure_and_start_io(accounts)
self.wait_configure_and_start_io()
# to reduce logging for higher level tests, logging only starts
# after initial successful configuration
for acc in accounts:
acc.add_account_plugin(FFIEventLogger(acc))
return accounts
@@ -370,21 +372,16 @@ class ACFactory:
ac._configtracker = ac.configure()
return ac
def wait_configure_and_start_io(self, accounts=None):
if accounts is None:
accounts = self._accounts[:]
started_accounts = []
for acc in accounts:
if acc not in started_accounts:
self.wait_configure(acc)
acc.set_config("bcc_self", "0")
if acc.is_configured():
acc.start_io()
started_accounts.append(acc)
print("{}: {} account was started".format(
acc.get_config("displayname"), acc.get_config("addr")))
for acc in started_accounts:
acc._evtracker.wait_all_initial_fetches()
def wait_configure_and_start_io(self):
for acc in self._accounts:
self.wait_configure(acc)
acc.set_config("bcc_self", "0")
acc.start_io()
print("{}: {} waiting for inbox idle to become ready".format(
acc.get_config("displayname"), acc.get_config("addr")))
acc._evtracker.wait_idle_inbox_ready()
print("{}: {} account IMAP IO ready to receive".format(
acc.get_config("displayname"), acc.get_config("addr")))
def wait_configure(self, acc):
if hasattr(acc, "_configtracker"):