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

Make scan_folders work when inbox is not watched (#2446)

Browse Source 
When watch_inbox was off, scan_folders failed and a toast "IMAP operation attempted while it is torn down" was shown.

--

The problem was:

When inbox_watch is off, scan_folders() is called at 244260a978/src/scheduler.rs (L107) but connect_configured() is not called before.



* Add test

* Don't only setup handle, but connect_configured() in scan_folders()
This commit is contained in:
Hocuri
2021-05-16 22:18:38 +02:00
committed by GitHub
parent 09280508bc
commit a9f5077cf9
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
python/tests/test_account.py
View File

@@ -2396,26 +2396,31 @@ class TestOnlineAccount:
assert received_reply.quoted_text == "hello" assert received_reply.quoted_text == "hello"
assert received_reply.quote.id == out_msg.id assert received_reply.quote.id == out_msg.id
@pytest.mark.parametrize("folder,move,expected_destination,", [ @pytest.mark.parametrize("folder,move,expected_destination,inbox_watch,", [
("xyz", False, "xyz"), # Test that emails are recognized in a random folder but not moved ("xyz", False, "xyz", "1"), # Test that emails are recognized in a random folder but not moved
("xyz", True, "DeltaChat"), # ...emails are found in a random folder and moved to DeltaChat ("xyz", True, "DeltaChat", "1"), # ...emails are found in a random folder and moved to DeltaChat
("Spam", False, "INBOX") # ...emails are moved from the spam folder to the Inbox ("Spam", False, "INBOX", "1"), # ...emails are moved from the spam folder to the Inbox
("INBOX", False, "INBOX", "0"), # ...emails are found in the `Inbox` folder even if `inbox_watch` is "0"
]) ])
# Testrun.org does not support the CREATE-SPECIAL-USE capability, which means that we can't create a folder with # Testrun.org does not support the CREATE-SPECIAL-USE capability, which means that we can't create a folder with
# the "\Junk" flag (see https://tools.ietf.org/html/rfc6154). So, we can't test spam folder detection by flag. # the "\Junk" flag (see https://tools.ietf.org/html/rfc6154). So, we can't test spam folder detection by flag.
def test_scan_folders(self, acfactory, lp, folder, move, expected_destination): def test_scan_folders(self, acfactory, lp, folder, move, expected_destination, inbox_watch):
"""Delta Chat periodically scans all folders for new messages to make sure we don't miss any.""" """Delta Chat periodically scans all folders for new messages to make sure we don't miss any."""
variant = folder + "-" + str(move) + "-" + expected_destination variant = folder + "-" + str(move) + "-" + expected_destination
lp.sec("Testing variant " + variant) lp.sec("Testing variant " + variant)
ac1 = acfactory.get_online_configuring_account(move=move) ac1 = acfactory.get_online_configuring_account(move=move)
ac2 = acfactory.get_online_configuring_account() ac2 = acfactory.get_online_configuring_account()
ac1.set_config("inbox_watch", inbox_watch)
acfactory.wait_configure(ac1) acfactory.wait_configure(ac1)
ac1.direct_imap.create_folder(folder) ac1.direct_imap.create_folder(folder)
acfactory.wait_configure_and_start_io() acfactory.wait_configure_and_start_io()
# Wait until each folder was selected once and we are IDLEing: # Wait until each folder was selected once and we are IDLEing:
ac1._evtracker.get_info_contains("INBOX: Idle entering wait-on-remote state") if inbox_watch == "1":
ac1._evtracker.get_info_contains("INBOX: Idle entering wait-on-remote state")
else:
ac1._evtracker.get_info_contains("IMAP-fake-IDLE: no folder, waiting for interrupt")
ac1.stop_io() ac1.stop_io()
# Send a message to ac1 and move it to the mvbox: # Send a message to ac1 and move it to the mvbox:
@@ -2432,7 +2437,10 @@ class TestOnlineAccount:
assert msg.text == "hello" assert msg.text == "hello"
# Wait until the message was moved (if at all) and we are IDLEing again: # Wait until the message was moved (if at all) and we are IDLEing again:
ac1._evtracker.get_info_contains("INBOX: Idle entering wait-on-remote state") if inbox_watch == "1":
ac1._evtracker.get_info_contains("INBOX: Idle entering wait-on-remote state")
else:
ac1._evtracker.get_info_contains("IMAP-fake-IDLE: no folder, waiting for interrupt")
ac1.direct_imap.select_folder(expected_destination) ac1.direct_imap.select_folder(expected_destination)
assert len(ac1.direct_imap.get_all_messages()) == 1 assert len(ac1.direct_imap.get_all_messages()) == 1
if folder != expected_destination: if folder != expected_destination:

2
src/imap/scan_folders.rs
View File

@@ -25,7 +25,7 @@ impl Imap {
} }
info!(context, "Starting full folder scan"); info!(context, "Starting full folder scan");
self.setup_handle(context).await?; self.connect_configured(context).await?;
let session = self.session.as_mut(); let session = self.session.as_mut();
let session = session.context("scan_folders(): IMAP No Connection established")?; let session = session.context("scan_folders(): IMAP No Connection established")?;
let folders: Vec<_> = session.list(Some(""), Some("*")).await?.collect().await; let folders: Vec<_> = session.list(Some(""), Some("*")).await?.collect().await;