Stuck macOS CI

Author: m3nu

.github/workflows/test.yml

@@ -48,8 +48,8 @@ jobs:
         pip install -e .
         pip install -r requirements.d/dev.txt
 
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v1
+    # - name: Setup tmate session
+    #   uses: mxschmitt/action-tmate@v1
 
     - name: Test with pytest (Linux)
       if: runner.os == 'Linux'

src/vorta/application.py

@@ -105,6 +105,9 @@ def quit_app_action(self):
         del self.main_window
         self.scheduler.shutdown()
         self.backup_cancelled_event.emit()
+        while BorgThread.is_running():
+            print("Waiting for BorgThread to quit.")
+            time.sleep(2)
         cleanup_db()
 
     def create_backup_action(self, profile_id=None):

src/vorta/borg/borg_thread.py

@@ -290,6 +290,7 @@ def cancel(self):
                 self.process.terminate()
             mutex.unlock()
             self.terminate()
+            self.wait()
 
     def process_result(self, result):
         pass

tests/conftest.py

@@ -1,7 +1,7 @@
-import pytest
+import os
 import peewee
+import pytest
 import sys
-import os
 from datetime import datetime as dt
 from unittest.mock import MagicMock