mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-20 04:58:32 +02:00
Remove locked keyring for steps; generalize failed keyring
This commit is contained in:
parent
3b9d4f0b0c
commit
2c93002075
1 changed files with 5 additions and 26 deletions
|
@ -69,38 +69,19 @@ class NoKeyring(keyring.backend.KeyringBackend):
|
||||||
|
|
||||||
class FailedKeyring(keyring.backend.KeyringBackend):
|
class FailedKeyring(keyring.backend.KeyringBackend):
|
||||||
"""
|
"""
|
||||||
A keyring that simulates an environment with a keyring that has passwords, but fails
|
A keyring that cannot be retrieved.
|
||||||
to return them.
|
|
||||||
"""
|
|
||||||
|
|
||||||
priority = 2
|
|
||||||
keys = defaultdict(dict)
|
|
||||||
|
|
||||||
def set_password(self, servicename, username, password):
|
|
||||||
self.keys[servicename][username] = password
|
|
||||||
|
|
||||||
def get_password(self, servicename, username):
|
|
||||||
raise keyring.errors.NoKeyringError
|
|
||||||
|
|
||||||
def delete_password(self, servicename, username):
|
|
||||||
self.keys[servicename][username] = None
|
|
||||||
|
|
||||||
|
|
||||||
class LockedKeyring(keyring.backend.KeyringBackend):
|
|
||||||
"""
|
|
||||||
An environment with a locked keyring (where unlocking is unavailable or rejected).
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
priority = 2
|
priority = 2
|
||||||
|
|
||||||
def set_password(self, servicename, username, password):
|
def set_password(self, servicename, username, password):
|
||||||
raise keyring.errors.KeyringLocked
|
raise keyring.errors.KeyringError
|
||||||
|
|
||||||
def get_password(self, servicename, username):
|
def get_password(self, servicename, username):
|
||||||
raise keyring.errors.KeyringLocked
|
raise keyring.errors.KeyringError
|
||||||
|
|
||||||
def delete_password(self, servicename, username):
|
def delete_password(self, servicename, username):
|
||||||
raise keyring.errors.KeyringLocked
|
raise keyring.errors.KeyringError
|
||||||
|
|
||||||
|
|
||||||
# set a default keyring
|
# set a default keyring
|
||||||
|
@ -167,9 +148,7 @@ def use_password(context, password, num=1):
|
||||||
@given("we have a keyring")
|
@given("we have a keyring")
|
||||||
@given("we have a {type} keyring")
|
@given("we have a {type} keyring")
|
||||||
def set_keyring(context, type=None):
|
def set_keyring(context, type=None):
|
||||||
if type == "locked":
|
if type == "failed":
|
||||||
keyring.set_keyring(LockedKeyring())
|
|
||||||
elif type == "failed":
|
|
||||||
keyring.set_keyring(FailedKeyring())
|
keyring.set_keyring(FailedKeyring())
|
||||||
else:
|
else:
|
||||||
keyring.set_keyring(TestKeyring())
|
keyring.set_keyring(TestKeyring())
|
||||||
|
|
Loading…
Add table
Reference in a new issue