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

fix test for events

Browse Source
This commit is contained in:
holger krekel
2019-07-15 23:31:30 +02:00
parent 9ad4c9a6fe
commit e892c5cf4d
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
python/src/deltachat/__init__.py
View File

@@ -44,6 +44,9 @@ def py_dc_callback(ctx, evt, data1, data2):
try: try:
ret = callback(ctx, evt_name, data1, data2) ret = callback(ctx, evt_name, data1, data2)
if ret is None:
ret = 0
assert isinstance(ret, int), repr(res)
if event_sig_types & 4: if event_sig_types & 4:
return ffi.cast('uintptr_t', ret) return ffi.cast('uintptr_t', ret)
elif event_sig_types & 8: elif event_sig_types & 8:

5
python/src/deltachat/account.py
View File

@@ -45,6 +45,9 @@ class Account(object):
self._configkeys = self.get_config("sys.config_keys").split() self._configkeys = self.get_config("sys.config_keys").split()
self._imex_completed = threading.Event() self._imex_completed = threading.Event()
def __del__(self):
lib.dc_close(self._dc_context)
def _check_config_key(self, name): def _check_config_key(self, name):
if name not in self._configkeys: if name not in self._configkeys:
raise KeyError("{!r} not a valid config key, existing keys: {!r}".format( raise KeyError("{!r} not a valid config key, existing keys: {!r}".format(
@@ -414,7 +417,7 @@ class EventLogger:
raise ValueError("{}({!r},{!r})".format(*ev)) raise ValueError("{}({!r},{!r})".format(*ev))
return ev return ev
def get_matching(self, event_name_regex): def get_matching(self, event_name_regex, check_error=True):
self._log("-- waiting for event with regex: {} --".format(event_name_regex)) self._log("-- waiting for event with regex: {} --".format(event_name_regex))
rex = re.compile("(?:{}).*".format(event_name_regex)) rex = re.compile("(?:{}).*".format(event_name_regex))
while 1: while 1:

23
python/tests/test_lowlevel.py
View File

@@ -1,25 +1,26 @@
from __future__ import print_function from __future__ import print_function
import pytest import pytest
from deltachat import capi, Account, const, set_context_callback from deltachat import capi, Account, const, set_context_callback
from deltachat.capi import ffi
from deltachat.cutil import as_dc_charpointer from deltachat.cutil import as_dc_charpointer
from queue import Queue from deltachat.account import EventLogger
def test_empty_context(): def test_empty_context():
ctx = capi.lib.dc_context_new(capi.ffi.NULL, capi.ffi.NULL, capi.ffi.NULL) ctx = capi.lib.dc_context_new(capi.ffi.NULL, capi.ffi.NULL, capi.ffi.NULL)
capi.lib.dc_close(ctx) capi.lib.dc_close(ctx)
def test_set_context(): def test_dc_close_events():
ctx = capi.lib.dc_context_new(capi.ffi.NULL, capi.ffi.NULL, capi.ffi.NULL) ctx = capi.lib.dc_context_new(capi.lib.py_dc_callback, ffi.NULL, ffi.NULL)
evlog = EventLogger(ctx)
q = Queue() evlog.set_timeout(5)
set_context_callback(ctx, lambda *args: q.put(args)) set_context_callback(ctx, lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2))
name = as_dc_charpointer("ein")
email = as_dc_charpointer("ein@kontakt.org")
contact_id = capi.lib.dc_create_contact(ctx, name, email)
capi.lib.dc_close(ctx) capi.lib.dc_close(ctx)
q.get(timeout=10) # test that we get events from dc_close
print(evlog.get_matching("DC_EVENT_INFO", check_error=False))
print(evlog.get_matching("DC_EVENT_INFO", check_error=False))
print(evlog.get_matching("DC_EVENT_INFO", check_error=False))
print(evlog.get_matching("DC_EVENT_INFO", check_error=False))
def test_wrong_db(tmpdir): def test_wrong_db(tmpdir):