diff --git a/tests/common.py b/tests/common.py index 09a9cd5..5f69f3f 100644 --- a/tests/common.py +++ b/tests/common.py @@ -2,6 +2,8 @@ import json from datetime import datetime, timezone, timedelta from mnemonic import Mnemonic +from selfprivacy_api.jobs import Job, JobStatus + # for expiration tests. If headache, consider freezegun RECOVERY_KEY_VALIDATION_DATETIME = "selfprivacy_api.models.tokens.time.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( 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 != "" diff --git a/tests/test_backup.py b/tests/test_backup.py index b96f8e7..4543d33 100644 --- a/tests/test_backup.py +++ b/tests/test_backup.py @@ -42,6 +42,8 @@ from selfprivacy_api.backup.storage import Storage from selfprivacy_api.backup.local_secret import LocalBackupSecret from selfprivacy_api.backup.jobs import get_backup_fail +from tests.common import assert_job_errored + REPO_NAME = "test_backup" @@ -205,15 +207,6 @@ def all_job_text(job: Job) -> str: 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): # Discard our key to inject a failure old_key = LocalBackupSecret.get()