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

cleanup

Browse Source
This commit is contained in:
holger krekel
2020-06-05 23:12:05 +02:00
parent 4ad4d6d10d
commit d97d9980dd
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,23 +14,23 @@ def db_folder_attr(name):
class ImapConn: class ImapConn:
def __init__(self, account): def __init__(self, account):
self.account = account self.account = account
host = account.get_config("configured_mail_server"), host = account.get_config("configured_mail_server")
user = account.get_config("addr"), user = account.get_config("addr")
pw = account.get_config("mail_pw")) pw = account.get_config("mail_pw")
self.connection = imaplib.IMAP4_SSL(host) self.connection = imaplib.IMAP4_SSL(host)
self.connection.login(user, pw) self.connection.login(user, pw)
self._original_msg_count = {} self._original_msg_count = {}
self.select_folder("INBOX") self.select_folder("INBOX")
def shutdown(self): def shutdown(self):
try:
self.connection.logout()
except Exception:
print("Could not logout direct_imap conn")
try: try:
self.connection.close() self.connection.close()
except Exception: except Exception:
pass pass
try:
self.connection.logout()
except Exception:
print("Could not logout direct_imap conn")
def select_folder(self, foldername): def select_folder(self, foldername):
status, messages = self.connection.select(foldername) status, messages = self.connection.select(foldername)

2
python/tests/test_account.py
View File

@@ -1505,11 +1505,9 @@ class TestOnlineAccount:
ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT") ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
lp.sec("ac2: wait for incoming location message") lp.sec("ac2: wait for incoming location message")
# ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG") # "enabled-location streaming"
# currently core emits location changed before event_incoming message # currently core emits location changed before event_incoming message
ac2._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED") ac2._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED")
# ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG") # text message with location
locations = chat2.get_locations() locations = chat2.get_locations()
assert len(locations) == 1 assert len(locations) == 1