test(backups): move errored job checker into common test utils
This commit is contained in:
parent
c5b227226c
commit
28556bd22d
|
@ -2,6 +2,8 @@ import json
|
||||||
from datetime import datetime, timezone, timedelta
|
from datetime import datetime, timezone, timedelta
|
||||||
from mnemonic import Mnemonic
|
from mnemonic import Mnemonic
|
||||||
|
|
||||||
|
from selfprivacy_api.jobs import Job, JobStatus
|
||||||
|
|
||||||
# for expiration tests. If headache, consider freezegun
|
# for expiration tests. If headache, consider freezegun
|
||||||
RECOVERY_KEY_VALIDATION_DATETIME = "selfprivacy_api.models.tokens.time.datetime"
|
RECOVERY_KEY_VALIDATION_DATETIME = "selfprivacy_api.models.tokens.time.datetime"
|
||||||
DEVICE_KEY_VALIDATION_DATETIME = RECOVERY_KEY_VALIDATION_DATETIME
|
DEVICE_KEY_VALIDATION_DATETIME = RECOVERY_KEY_VALIDATION_DATETIME
|
||||||
|
@ -79,3 +81,12 @@ def assert_recovery_recent(time_generated: str):
|
||||||
assert datetime.fromisoformat(time_generated) - timedelta(seconds=5) < datetime.now(
|
assert datetime.fromisoformat(time_generated) - timedelta(seconds=5) < datetime.now(
|
||||||
timezone.utc
|
timezone.utc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def assert_job_errored(job: Job):
|
||||||
|
assert job is not None
|
||||||
|
assert job.status == JobStatus.ERROR
|
||||||
|
|
||||||
|
# consider adding a useful error message to an errored-out job
|
||||||
|
assert job.error is not None
|
||||||
|
assert job.error != ""
|
||||||
|
|
|
@ -42,6 +42,8 @@ from selfprivacy_api.backup.storage import Storage
|
||||||
from selfprivacy_api.backup.local_secret import LocalBackupSecret
|
from selfprivacy_api.backup.local_secret import LocalBackupSecret
|
||||||
from selfprivacy_api.backup.jobs import get_backup_fail
|
from selfprivacy_api.backup.jobs import get_backup_fail
|
||||||
|
|
||||||
|
from tests.common import assert_job_errored
|
||||||
|
|
||||||
|
|
||||||
REPO_NAME = "test_backup"
|
REPO_NAME = "test_backup"
|
||||||
|
|
||||||
|
@ -205,15 +207,6 @@ def all_job_text(job: Job) -> str:
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
def assert_job_errored(job: Job):
|
|
||||||
assert job is not None
|
|
||||||
assert job.status == JobStatus.ERROR
|
|
||||||
|
|
||||||
# consider adding a useful error message to an errored-out job
|
|
||||||
assert job.error is not None
|
|
||||||
assert job.error != ""
|
|
||||||
|
|
||||||
|
|
||||||
def test_error_censoring_encryptionkey(dummy_service, backups):
|
def test_error_censoring_encryptionkey(dummy_service, backups):
|
||||||
# Discard our key to inject a failure
|
# Discard our key to inject a failure
|
||||||
old_key = LocalBackupSecret.get()
|
old_key = LocalBackupSecret.get()
|
||||||
|
|
Loading…
Reference in New Issue