fix last failing test -- make account.shutdown() robust against getting called from event thread

python/src/deltachat/account.py

@@ -636,6 +636,7 @@ class Account(object):
         self._shutdown_event.set()
         hook = hookspec.Global._get_plugin_manager().hook
         hook.dc_account_after_shutdown(account=self, dc_context=dc_context)
+        self.log("shutdown finished")
 
 
 def _destroy_dc_context(dc_context, dc_context_unref=lib.dc_context_unref):

python/src/deltachat/events.py

@@ -147,6 +147,10 @@ class EventThread(threading.Thread):
         self._thread_quitflag = True
 
         if wait:
+            if self == threading.current_thread():
+                # we are in the callback thread and thus cannot
+                # wait for the thread-loop to finish.
+                return
             self.join()
 
     def run(self):