Test CI

Author: m3nu

.github/workflows/test.yml

@@ -59,10 +59,9 @@ jobs:
     - name: Test with pytest (macOS)
       if: runner.os == 'macOS'
       run: |
-        pytest
+        pytest --cov=vorta
 
     - name: Upload coverage to Codecov
-      if: runner.os == 'Linux'
       uses: codecov/codecov-action@v1
       env:
         OS: ${{ runner.os }}

src/vorta/borg/borg_thread.py

@@ -8,6 +8,7 @@
 import time
 import logging
 from collections import namedtuple
+from threading import Lock
 from PyQt5 import QtCore
 from PyQt5.QtWidgets import QApplication
 from subprocess import Popen, PIPE, TimeoutExpired
@@ -18,7 +19,7 @@
 from vorta.keyring.abc import VortaKeyring
 from vorta.keyring.db import VortaDBKeyring
 
-mutex = QtCore.QMutex()
+mutex = Lock()
 logger = logging.getLogger(__name__)
 
 FakeRepo = namedtuple('Repo', ['url', 'id', 'extra_borg_arguments', 'encryption'])
@@ -93,11 +94,7 @@ def __init__(self, cmd, params, parent=None):
 
     @classmethod
     def is_running(cls):
-        if mutex.tryLock():
-            mutex.unlock()
-            return False
-        else:
-            return True
+        return mutex.locked()
 
     @classmethod
     def prepare(cls, profile):
@@ -190,7 +187,7 @@ def prepare_bin(cls):
 
     def run(self):
         self.started_event()
-        mutex.lock()
+        mutex.acquire()
         log_entry = EventLogModel(category='borg-run',
                                   subcommand=self.cmd[1],
                                   profile=self.params.get('profile_name', None)
@@ -275,7 +272,7 @@ def read_async(fd):
 
         self.process_result(result)
         self.finished_event(result)
-        mutex.unlock()
+        mutex.release()
 
     def cancel(self):
         """
@@ -287,10 +284,11 @@ def cancel(self):
             try:
                 self.process.wait(timeout=3)
             except TimeoutExpired:
-                self.process.terminate()
-            mutex.unlock()
-            self.terminate()
+                os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
+            self.quit()
             self.wait()
+            if mutex.locked():
+                mutex.release()
 
     def process_result(self, result):
         pass

src/vorta/keyring/abc.py

@@ -5,6 +5,7 @@
 """
 import sys
 from pkg_resources import parse_version
+from vorta.i18n import trans_late
 
 
 class VortaKeyring:
@@ -55,6 +56,12 @@ def get_keyring(cls):
 
         return cls._keyring
 
+    def get_backend_warning(self):
+        if self.is_system:
+            return trans_late('utils', 'Storing password in your password manager.')
+        else:
+            return trans_late('utils', 'Saving password with Vorta settings.')
+
     def set_password(self, service, repo_url, password):
         """
         Writes a password to the underlying store.

src/vorta/models.py

@@ -279,6 +279,7 @@ def get_misc_settings():
 def cleanup_db():
     # Clean up database
     db.execute_sql("VACUUM")
+    db.close()
 
 
 def init_db(con=None):

src/vorta/views/repo_add_dialog.py

@@ -7,7 +7,7 @@
 from vorta.keyring.abc import VortaKeyring
 from vorta.borg.init import BorgInitThread
 from vorta.borg.info_repo import BorgInfoRepoThread
-from vorta.i18n import translate, trans_late
+from vorta.i18n import translate
 from vorta.views.utils import get_colored_icon
 from vorta.models import RepoModel
 
@@ -31,7 +31,7 @@ def __init__(self, parent=None):
         self.repoURL.textChanged.connect(self.set_password)
         self.passwordLineEdit.textChanged.connect(self.password_listener)
         self.confirmLineEdit.textChanged.connect(self.password_listener)
-        self.encryptionComboBox.activated.connect(self.display_password_backend)
+        self.encryptionComboBox.activated.connect(self.display_backend_warning)
 
         # Add clickable icon to toggle password visibility to end of box
         self.showHideAction = QAction(self.tr("Show my passwords"), self)
@@ -45,7 +45,7 @@ def __init__(self, parent=None):
         self.init_encryption()
         self.init_ssh_key()
         self.set_icons()
-        self.display_password_backend()
+        self.display_backend_warning()
 
     def set_icons(self):
         self.chooseLocalFolderButton.setIcon(get_colored_icon('folder-open'))
@@ -64,17 +64,10 @@ def values(self):
             out['encryption'] = self.encryptionComboBox.currentData()
         return out
 
-    def display_password_backend(self):
+    def display_backend_warning(self):
         '''Display password backend message based off current keyring'''
-        backend_msg = ''
         if self.encryptionComboBox.currentData() != 'none':
-            keyring = VortaKeyring.get_keyring()
-            if keyring.is_system:
-                backend_msg = trans_late('utils', 'Storing password in your password manager.')
-            else:
-                backend_msg = trans_late('utils', 'Saving password with Vorta settings.')
-
-        self.passwordLabel.setText(backend_msg)
+            self.passwordLabel.setText(VortaKeyring.get_keyring().get_backend_warning())
 
     def choose_local_backup_folder(self):
         def receive():

tests/conftest.py

@@ -34,11 +34,12 @@ def qapp(tmpdir_factory):
     qapp = VortaApp([])  # Only init QApplication once to avoid segfaults while testing.
 
     yield qapp
+    mock_db.close()
     qapp.quit()
 
 
 @pytest.fixture(scope='function', autouse=True)
-def init_db(qapp, tmpdir_factory):
+def init_db(qapp, qtbot, tmpdir_factory):
     tmp_db = tmpdir_factory.mktemp('Vorta').join('settings.sqlite')
     mock_db = peewee.SqliteDatabase(str(tmp_db), pragmas={'journal_mode': 'wal', })
     vorta.models.init_db(mock_db)
@@ -61,18 +62,14 @@ def init_db(qapp, tmpdir_factory):
     source_dir = SourceFileModel(dir='/tmp/another', repo=new_repo, dir_size=100, dir_files_count=18, path_isdir=True)
     source_dir.save()
 
+    qapp.main_window.deleteLater()
+    del qapp.main_window
     qapp.main_window = MainWindow(qapp)  # Re-open main window to apply mock data in UI
 
-
-@pytest.fixture(scope='function', autouse=True)
-def cleanup(request, qapp, qtbot):
-    """
-    Cleanup after each test
-    """
-    def ensure_borg_thread_stopped():
-        qapp.backup_cancelled_event.emit()
-        qtbot.waitUntil(lambda: not vorta.borg.borg_thread.BorgThread.is_running())
-    request.addfinalizer(ensure_borg_thread_stopped)
+    yield
+    qapp.backup_cancelled_event.emit()
+    qtbot.waitUntil(lambda: not vorta.borg.borg_thread.BorgThread.is_running())
+    mock_db.close()
 
 
 @pytest.fixture