Skip to content

Commit

Permalink
Fix tests and linting
Browse files Browse the repository at this point in the history
  • Loading branch information
m3nu committed Apr 9, 2023
1 parent 0f9f8e3 commit 3f6a46d
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 11 deletions.
4 changes: 1 addition & 3 deletions src/vorta/notifications.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ def _dbus_notify(self, header, msg, level='info'):
path = "/org/freedesktop/Notifications"
interface = "org.freedesktop.Notifications"
app_name = "vorta"
v = QtCore.QVariant(12321) # random int to identify all notifications
if v.convert(QtCore.QVariant.UInt):
id_replace = v
id_replace = QtCore.QVariant(12321) # random int to identify all notifications
icon = "com.borgbase.Vorta-symbolic"
title = header
text = msg
Expand Down
2 changes: 1 addition & 1 deletion src/vorta/tray_menu.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
from PyQt6.QtGui import QColor, QScreen, QIcon
from PyQt6.QtGui import QColor, QIcon, QScreen
from PyQt6.QtWidgets import QApplication, QMenu, QSystemTrayIcon
from vorta.store.models import BackupProfileModel
from vorta.utils import get_asset
Expand Down
1 change: 0 additions & 1 deletion src/vorta/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from vorta.log import logger
from vorta.network_status.abc import NetworkStatusMonitor


borg_compat = BorgCompatibility()
_network_status_monitor = None

Expand Down
4 changes: 2 additions & 2 deletions src/vorta/views/archive_tab.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
from typing import Dict, Optional
from PyQt6 import QtCore, uic
from PyQt6.QtCore import QItemSelectionModel, QMimeData, QPoint, Qt, pyqtSlot
from PyQt6.QtGui import QDesktopServices, QKeySequence, QAction, QShortcut
from PyQt6.QtGui import QAction, QDesktopServices, QKeySequence, QShortcut
from PyQt6.QtWidgets import (
QAbstractItemView,
QApplication,
QHeaderView,
QInputDialog,
Expand All @@ -15,7 +16,6 @@
QTableView,
QTableWidgetItem,
QWidget,
QAbstractItemView,
)
from vorta.borg.check import BorgCheckJob
from vorta.borg.compact import BorgCompactJob
Expand Down
2 changes: 1 addition & 1 deletion src/vorta/views/schedule_tab.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from PyQt6 import QtCore, uic
from PyQt6.QtCore import QDateTime, QLocale
from PyQt6.QtWidgets import QApplication, QHeaderView, QListWidgetItem, QTableView, QTableWidgetItem, QAbstractItemView
from PyQt6.QtWidgets import QAbstractItemView, QApplication, QHeaderView, QListWidgetItem, QTableWidgetItem
from vorta import application
from vorta.i18n import get_locale
from vorta.scheduler import ScheduleStatusType
Expand Down
2 changes: 1 addition & 1 deletion src/vorta/views/source_tab.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from pathlib import PurePath
from PyQt6 import QtCore, QtGui, uic
from PyQt6.QtCore import QFileInfo, QMimeData, QPoint, Qt, QUrl, pyqtSlot
from PyQt6.QtWidgets import QApplication, QHeaderView, QMenu, QMessageBox, QTableWidgetItem
from PyQt6.QtGui import QShortcut
from PyQt6.QtWidgets import QApplication, QHeaderView, QMenu, QMessageBox, QTableWidgetItem
from vorta.store.models import BackupProfileMixin, SettingsModel, SourceFileModel
from vorta.utils import FilePathInfoAsync, choose_file_dialog, get_asset, pretty_bytes, sort_sizes
from vorta.views.utils import get_colored_icon
Expand Down
4 changes: 2 additions & 2 deletions tests/test_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def test_profile_add(qapp, qtbot):
qtbot.mouseClick(main.profileAddButton, QtCore.Qt.MouseButton.LeftButton)

add_profile_window = main.window
qtbot.addWidget(add_profile_window)
# qtbot.addWidget(add_profile_window)

qtbot.keyClicks(add_profile_window.profileNameField, 'Test Profile')
qtbot.mouseClick(
Expand All @@ -24,7 +24,7 @@ def test_profile_edit(qapp, qtbot):
qtbot.mouseClick(main.profileRenameButton, QtCore.Qt.MouseButton.LeftButton)

edit_profile_window = main.window
qtbot.addWidget(edit_profile_window)
# qtbot.addWidget(edit_profile_window)

edit_profile_window.profileNameField.setText("")
qtbot.keyClicks(edit_profile_window.profileNameField, 'Test Profile')
Expand Down

0 comments on commit 3f6a46d

Please sign in to comment.