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

simplify thread handling

Browse Source
This commit is contained in:
=
2020-01-29 16:48:09 +00:00
parent 26c39f876b
commit 289d8fdabf
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
python/tests/test_lowlevel.py
View File

@@ -5,20 +5,16 @@ from deltachat.capi import ffi
from deltachat.capi import lib from deltachat.capi import lib
from deltachat.account import EventLogger from deltachat.account import EventLogger
class EventThread:
def __init__(self, dc_context):
self._dc_context = dc_context
def start(self): def make_event_thread(dc_context, start):
self.thread = threading.Thread(target=self.run) def run():
self.thread.setDaemon(1) lib.dc_context_run(dc_context, lib.py_dc_callback)
self.thread.start()
def stop(self): thread = threading.Thread(target=run)
lib.dc_context_shutdown(self._dc_context) thread.setDaemon(1)
if start:
def run(self): thread.start()
lib.dc_context_run(self._dc_context, lib.py_dc_callback) return thread
def test_empty_context(): def test_empty_context():
@@ -36,14 +32,14 @@ def test_start_stop_event_thread_basic():
print("1") print("1")
ctx = capi.lib.dc_context_new(ffi.NULL, ffi.NULL) ctx = capi.lib.dc_context_new(ffi.NULL, ffi.NULL)
print("2") print("2")
ev_thread = EventThread(ctx) ev_thread = make_event_thread(ctx, start=False)
print("3 -- starting event thread") print("3 -- starting event thread")
ev_thread.start() ev_thread.start()
print("4 -- started, closing context") print("4 -- started thread, closing context")
capi.lib.dc_close(ctx) capi.lib.dc_close(ctx)
print("4 -- clear context callback") print("5 -- clear context callback")
clear_context_callback(ctx) clear_context_callback(ctx)
print("4 -- stopping event thread") print("6 -- stopping event thread")
ev_thread.stop() ev_thread.stop()
def test_dc_close_events(tmpdir): def test_dc_close_events(tmpdir):
@@ -57,8 +53,8 @@ def test_dc_close_events(tmpdir):
ctx, ctx,
lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2) lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2)
) )
thread = EventThread(ctx) ev_thread = make_event_thread(ctx, start=True)
thread.start()
p = tmpdir.join("hello.db") p = tmpdir.join("hello.db")
lib.dc_open(ctx, p.strpath.encode("ascii"), ffi.NULL) lib.dc_open(ctx, p.strpath.encode("ascii"), ffi.NULL)
capi.lib.dc_close(ctx) capi.lib.dc_close(ctx)
@@ -77,7 +73,7 @@ def test_dc_close_events(tmpdir):
find("disconnecting mvbox-thread") find("disconnecting mvbox-thread")
find("disconnecting SMTP") find("disconnecting SMTP")
find("Database closed") find("Database closed")
thread.stop() ev_thread.stop()
def test_wrong_db(tmpdir): def test_wrong_db(tmpdir):