fix various integration tests with the python bindings

python/src/deltachat/account.py

@@ -565,15 +565,18 @@ class IOThreads:
         self._thread_quitflag = False
         self._name2thread = {}
         self._log_event = log_event
-        self._running = False
+        self._log_running = True
 
+        # Make sure the current
+        self._start_one_thread("deltachat-log", self.dc_thread_run)
+        
     def is_started(self):
-        return self._running
+        return lib.dc_is_open(self._dc_context) and lib.dc_is_running(self._dc_context) 
 
     def start(self, imap=True, smtp=True, mvbox=False, sentbox=False):
         assert not self.is_started()
-        self._running = True
-        self._start_one_thread("deltachat", self.dc_thread_run)
+        
+        lib.dc_context_run(self._dc_context)
 
     def _start_one_thread(self, name, func):
         self._name2thread[name] = t = threading.Thread(target=func, name=name)
@@ -581,18 +584,14 @@ class IOThreads:
         t.start()
 
     def stop(self, wait=False):
-        lib.dc_context_shutdown(self._dc_context)
-        if wait:
-            for name, thread in self._name2thread.items():
-                thread.join()
-        self._running = False
+        if self.is_started():
+            lib.dc_context_shutdown(self._dc_context)
 
     def dc_thread_run(self):
-        self._log_event("py-bindings-info", 0, "DC THREAD START")
+        self._log_event("py-bindings-info", 0, "DC LOG THREAD START")
 
-        lib.dc_context_run(self._dc_context)
-        while self._running:
-            if lib.dc_has_next_event(self._dc_context):
+        while self._log_running:
+            if lib.dc_is_open(self._dc_context) and lib.dc_has_next_event(self._dc_context):
                 event = lib.dc_get_next_event(self._dc_context)
                 if event != ffi.NULL:
                     deltachat.py_dc_callback(
@@ -605,7 +604,7 @@ class IOThreads:
                 else:
                     time.sleep(0.05)
 
-        self._log_event("py-bindings-info", 0, "DC THREAD FINISHED")
+        self._log_event("py-bindings-info", 0, "DC LOG THREAD FINISHED")
 
 def _destroy_dc_context(dc_context, dc_context_unref=lib.dc_context_unref):
     # destructor for dc_context

python/tests/conftest.py

@@ -223,7 +223,7 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, datadir):
                 pre_generated_key=pre_generated_key)
             configdict.update(config)
             ac.configure(**configdict)
-            ac.start_threads(mvbox=mvbox, sentbox=sentbox)
+            ac.start_threads()
             return ac
 
         def get_one_online_account(self, pre_generated_key=True):

python/tests/test_account.py

@@ -178,7 +178,6 @@ class TestOfflineChat:
         assert d["draft"] == "" if chat.get_draft() is None else chat.get_draft()
 
     def test_group_chat_creation_with_translation(self, ac1):
-        ac1.start_threads()
         ac1.set_stock_translation(const.DC_STR_NEWGROUPDRAFT, "xyz %1$s")
         ac1._evlogger.consume_events()
         with pytest.raises(ValueError):
@@ -198,7 +197,6 @@ class TestOfflineChat:
         assert not chat.is_promoted()
         msg = chat.get_draft()
         assert msg.text == "xyz title1"
-        ac1.stop_threads()
 
     @pytest.mark.parametrize("verified", [True, False])
     def test_group_chat_qr(self, acfactory, ac1, verified):
@@ -351,6 +349,7 @@ class TestOfflineChat:
             ac1.configure(addr="123@example.org")
 
     def test_import_export_one_contact(self, acfactory, tmpdir):
+        print("START")
         backupdir = tmpdir.mkdir("backup")
         ac1 = acfactory.get_configured_offline_account()
         contact1 = ac1.create_contact("some1@hello.com", name="some1")
@@ -362,24 +361,27 @@ class TestOfflineChat:
         with bin.open("w") as f:
             f.write("\00123" * 10000)
         msg = chat.send_file(bin.strpath)
-
+        print("L1")
         contact = msg.get_sender_contact()
         assert contact == ac1.get_self_contact()
         assert not backupdir.listdir()
-
+        print("L2")
         path = ac1.export_all(backupdir.strpath)
         assert os.path.exists(path)
         ac2 = acfactory.get_unconfigured_account()
         ac2.import_all(path)
         contacts = ac2.get_contacts(query="some1")
         assert len(contacts) == 1
+        print("L3")
         contact2 = contacts[0]
         assert contact2.addr == "some1@hello.com"
         chat2 = ac2.create_chat_by_contact(contact2)
         messages = chat2.get_messages()
         assert len(messages) == 2
+        print("L4")
         assert messages[0].text == "msg1"
         assert os.path.exists(messages[1].filename)
+        print("STOP")
 
     def test_ac_setup_message_fails(self, ac1):
         with pytest.raises(RuntimeError):

python/tests/test_lowlevel.py

@@ -131,8 +131,7 @@ def test_sig():
 
 def test_markseen_invalid_message_ids(acfactory):
     ac1 = acfactory.get_configured_offline_account()
-    
-    ac1.start_threads()
+
     contact1 = ac1.create_contact(email="some1@example.com", name="some1")
     chat = ac1.create_chat_by_contact(contact1)
     chat.send_text("one messae")
@@ -140,7 +139,6 @@ def test_markseen_invalid_message_ids(acfactory):
     msg_ids = [9]
     lib.dc_markseen_msgs(ac1._dc_context, msg_ids, len(msg_ids))
     ac1._evlogger.ensure_event_not_queued("DC_EVENT_WARNING|DC_EVENT_ERROR")
-    ac1.stop_threads()
 
 
 def test_get_special_message_id_returns_empty_message(acfactory):