Skip to content

fix: avoid traceback for absent keyring entries #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UglyEgg wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

fix: avoid traceback for absent keyring entries #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion proton/keyring_linux/core/keyring_linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def _del_item(self, key):
try:
self.__keyring_backend.delete_password(self.KEYRING_SERVICE, key)
except keyring.errors.PasswordDeleteError as excp:
logging.exception("Unable to delete entry from keyring")
logger.debug("Keyring entry is already absent")
raise KeyError(key) from excp
except keyring.errors.KeyringError as excp:
logging.exception("Keyring error while deleting")
Expand Down
25 changes: 19 additions & 6 deletions tests/test_linuxkeyring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
"""
from proton.keyring_linux.core import KeyringBackendLinux
import logging
import pytest
from unittest import mock
import json
Expand Down Expand Up @@ -81,18 +82,30 @@ def test_get_item_raises_exception_corrupted_data(mock_backend, keyring_service)
k._get_item("test")


def test_del_item_raises_exception_missing_key(mock_backend, keyring_service):
def test_del_item_raises_exception_missing_key_without_error_log(
mock_backend, keyring_service, caplog
):
mock_backend.delete_password.side_effect = errors.PasswordDeleteError()
k = KeyringBackendLinux(keyring_backend=mock_backend)
with pytest.raises(KeyError):
k._del_item("test")
with caplog.at_level(logging.DEBUG):
with pytest.raises(KeyError):
k._del_item("test")

assert "Keyring entry is already absent" in caplog.messages
assert not [record for record in caplog.records if record.levelno >= logging.ERROR]


def test_del_item_raises_exception_keyring_error(mock_backend, keyring_service):
def test_del_item_raises_exception_keyring_error(
mock_backend, keyring_service, caplog
):
mock_backend.delete_password.side_effect = errors.KeyringError()
k = KeyringBackendLinux(keyring_backend=mock_backend)
with pytest.raises(KeyringError):
k._del_item("test")
with caplog.at_level(logging.ERROR):
with pytest.raises(KeyringError):
k._del_item("test")

assert "Keyring error while deleting" in caplog.messages
assert any(record.exc_info is not None for record in caplog.records)


def test_set_item_raises_exception_keyring_unable_to_add(mock_backend, keyring_service):
Expand Down