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'
@@ -62,6 +62,7 @@ jobs:
         pytest
 
     - name: Upload coverage to Codecov
+      if: runner.os == 'Linux'
       uses: codecov/codecov-action@v1
       env:
         OS: ${{ runner.os }}

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

src/vorta/keyring/abc.py

@@ -16,8 +16,8 @@ def get_keyring(cls):
         Choose available Keyring or save passwords to settings database.
 
         Will always use Keychain on macOS. Will try KWallet and then Secret
-        Storage on Linux and *BSD. If non are available or usage of system keychain
-        is disabled, fall back to saving passwords to DB.
+        Storage on Linux and *BSD. If none are available or usage of system
+        keychain is disabled, fall back to saving passwords to DB.
         """
 
         from vorta.models import SettingsModel

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