better modularize functionality and use it from tests

python/tests/conftest.py

@@ -1,20 +1,6 @@
 import pytest
 
 import deltachat
-from deltachat import capi
-import threading
-
-
-@pytest.fixture
-def register_dc_callback(monkeypatch):
-    """Register a callback for a given context.
-
-    This is a function-scoped fixture and the function will be
-    unregisterd automatically on fixture teardown.
-    """
-    def register_dc_callback(ctx, func):
-        monkeypatch.setitem(deltachat._DC_CALLBACK_MAP, ctx, func)
-    return register_dc_callback
 
 
 def pytest_addoption(parser):
@@ -32,39 +18,6 @@ def userpassword(pytestconfig):
     pytest.skip("specify a test account with --user and --password options")
 
 
-
-def imap_thread(context, quitflag):
-    print ("starting imap thread")
-    while not quitflag.is_set():
-        capi.lib.dc_perform_imap_jobs(context)
-        capi.lib.dc_perform_imap_fetch(context)
-        capi.lib.dc_perform_imap_idle(context)
-
-
-def smtp_thread(context, quitflag):
-    print ("starting smtp thread")
-    while not quitflag.is_set():
-        capi.lib.dc_perform_smtp_jobs(context)
-        capi.lib.dc_perform_smtp_idle(context)
-
-
 @pytest.fixture
-def dc_context():
-    ctx = capi.lib.dc_context_new(capi.lib.py_dc_callback,
-                                  capi.ffi.NULL, capi.ffi.NULL)
-    yield ctx
-    capi.lib.dc_close(ctx)
-
-
-@pytest.fixture
-def dc_threads(dc_context):
-    quitflag = threading.Event()
-    t1 = threading.Thread(target=imap_thread, name="imap", args=[dc_context, quitflag])
-    t1.setDaemon(1)
-    t1.start()
-    t2 = threading.Thread(target=smtp_thread, name="smtp", args=[dc_context, quitflag])
-    t2.setDaemon(1)
-    t2.start()
-    yield
-    quitflag.set()
-
+def tmp_db_path(tmpdir):
+    return tmpdir.join("test.db").strpath

python/tests/test_lowlevel.py

@@ -1,8 +1,7 @@
 from __future__ import print_function
 import deltachat
 import re
-import requests
-from deltachat import capi, get_dc_event_name
+from deltachat import capi
 from deltachat.capi import ffi
 import queue
 
@@ -16,70 +15,21 @@ def test_event_defines():
     assert capi.lib.DC_EVENT_INFO == 100
 
 
-def test_cb(register_dc_callback):
-    def cb(ctx, evt, data1, data2):
-        return 0
-    ctx = capi.lib.dc_context_new(capi.lib.py_dc_callback,
-                                  capi.ffi.NULL, capi.ffi.NULL)
-    register_dc_callback(ctx, cb)
-    capi.lib.dc_close(ctx)
-    assert deltachat._DC_CALLBACK_MAP[ctx] is cb
-
-
-def test_basic_events(dc_context, dc_threads, register_dc_callback, tmpdir, userpassword):
-    q = queue.Queue()
-    def cb(dc_context, evt, data1, data2):
-        # the following code relates to the deltachat/_build.py's helper
-        # function which provides us signature info of an event call
-        event_sig_types = capi.lib.dc_get_event_signature_types(evt)
-        if data1 and event_sig_types & 1:
-            data1 = ffi.string(ffi.cast('char*', data1))
-        if data2 and event_sig_types & 2:
-            data2 = ffi.string(ffi.cast('char*', data2))
-        evt_name = get_dc_event_name(evt)
-        print (evt_name, data1, data2)
-        if evt_name == "DC_EVENT_HTTP_GET":
-            content =  read_url(data1)
-            s = content.encode("utf-8")
-            # we need to return a pointer that the core owns
-            dupped = capi.lib.dupstring_helper(s)
-            return ffi.cast('uintptr_t', dupped)
-        elif evt_name == "DC_EVENT_IS_OFFLINE":
-            return 0
-        elif event_sig_types & (4|8):  # returning string or int means it's a sync event
-            print ("dropping sync event: no handler for", evt_name)
-            return 0
-        # async event
-        q.put((evt_name, data1, data2))
-        return 0
-
-    register_dc_callback(dc_context, cb)
-
-    dbfile = tmpdir.join("test.db")
-    capi.lib.dc_open(dc_context, dbfile.strpath, capi.ffi.NULL)
-    capi.lib.dc_set_config(dc_context, "addr", userpassword[0])
-    capi.lib.dc_set_config(dc_context, "mail_pw", userpassword[1])
-    capi.lib.dc_configure(dc_context)
-
-    imap_ok = smtp_ok = False
-    while not imap_ok or not smtp_ok:
-        evt_name, data1, data2 = q.get(timeout=5.0)
-        if evt_name == "DC_EVENT_ERROR":
-            assert 0
-        if evt_name == "DC_EVENT_INFO":
-            if re.match("imap-login.*ok.", data2.lower()):
-                imap_ok = True
-            if re.match("smtp-login.*ok.", data2.lower()):
-                smtp_ok = True
-    assert 0
-    # assert capi.lib.dc_imap_is_connected(dc_context)
-    # assert capi.lib.dc_smtp_is_connected(dc_context)
-
-
-def read_url(url):
-    try:
-        r = requests.get(url)
-    except requests.ConnectionError:
-        return ''
-    else:
-        return r.content
+class TestLive:
+    def test_basic_configure_login_ok(self, request, tmp_db_path, userpassword):
+        q = queue.Queue()
+        dc = deltachat.Account(tmp_db_path, logcallback=q.put)
+        dc.set_config(addr=userpassword[0], mail_pw=userpassword[1])
+        dc.start()
+        request.addfinalizer(dc.shutdown)
+        imap_ok = smtp_ok = False
+        while not imap_ok or not smtp_ok:
+            evt_name, data1, data2 = q.get(timeout=5.0)
+            print(evt_name, data1, data2)
+            if evt_name == "DC_EVENT_ERROR":
+                assert 0
+            if evt_name == "DC_EVENT_INFO":
+                if re.match("imap-login.*ok.", data2.lower()):
+                    imap_ok = True
+                if re.match("smtp-login.*ok.", data2.lower()):
+                    smtp_ok = True