From 78f36aaa0d19f605624540e86f2a9b2b91485bb7 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 21 Feb 2020 21:42:07 +0100 Subject: [PATCH] another bug fix --- python/src/deltachat/eventlogger.py | 2 +- python/tests/test_lowlevel.py | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/python/src/deltachat/eventlogger.py b/python/src/deltachat/eventlogger.py index cbfacfc3e..e1dfffda6 100644 --- a/python/src/deltachat/eventlogger.py +++ b/python/src/deltachat/eventlogger.py @@ -29,7 +29,7 @@ class EventLogger: def consume_events(self, check_error=True): while not self._event_queue.empty(): - self.get() + self.get(check_error=check_error) def get(self, timeout=None, check_error=True): timeout = timeout or self._timeout diff --git a/python/tests/test_lowlevel.py b/python/tests/test_lowlevel.py index 273414e99..bf3b1f085 100644 --- a/python/tests/test_lowlevel.py +++ b/python/tests/test_lowlevel.py @@ -2,7 +2,6 @@ from __future__ import print_function from deltachat import capi, cutil, const, set_context_callback, clear_context_callback from deltachat.capi import ffi from deltachat.capi import lib -from deltachat.account import EventLogger def test_empty_context(): @@ -18,21 +17,13 @@ def test_callback_None2int(): def test_dc_close_events(tmpdir): - ctx = ffi.gc( - capi.lib.dc_context_new(capi.lib.py_dc_callback, ffi.NULL, ffi.NULL), - lib.dc_context_unref, - ) - evlog = EventLogger(ctx) - evlog.set_timeout(5) - set_context_callback( - ctx, - lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2) - ) + from deltachat.account import Account p = tmpdir.join("hello.db") - lib.dc_open(ctx, p.strpath.encode("ascii"), ffi.NULL) - capi.lib.dc_close(ctx) + ac1 = Account(p.strpath) + ac1.shutdown() def find(info_string): + evlog = ac1._evlogger while 1: ev = evlog.get_matching("DC_EVENT_INFO", check_error=False) data2 = ev[2]