From f5faf84a2b58012f1444e530f033ac17edb95f2a Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Wed, 4 Jan 2023 16:49:40 +0000 Subject: [PATCH] test(tokens-repo): move timewarping to test commons --- tests/common.py | 11 +++++++++++ tests/test_rest_endpoints/test_auth.py | 15 +++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/common.py b/tests/common.py index 18e065c..95488cc 100644 --- a/tests/common.py +++ b/tests/common.py @@ -1,6 +1,17 @@ import json +import datetime from mnemonic import Mnemonic +# for expiration tests. If headache, consider freezegun +RECOVERY_KEY_VALIDATION_DATETIME = "selfprivacy_api.models.tokens.recovery_key.datetime" +DEVICE_KEY_VALIDATION_DATETIME = "selfprivacy_api.models.tokens.new_device_key.datetime" + + +class NearFuture(datetime.datetime): + @classmethod + def now(cls): + return datetime.datetime.now() + datetime.timedelta(minutes=13) + def read_json(file_path): with open(file_path, "r", encoding="utf-8") as file: diff --git a/tests/test_rest_endpoints/test_auth.py b/tests/test_rest_endpoints/test_auth.py index 1872203..1632e22 100644 --- a/tests/test_rest_endpoints/test_auth.py +++ b/tests/test_rest_endpoints/test_auth.py @@ -5,6 +5,11 @@ import datetime import pytest from tests.conftest import TOKENS_FILE_CONTENTS +from tests.common import ( + RECOVERY_KEY_VALIDATION_DATETIME, + DEVICE_KEY_VALIDATION_DATETIME, + NearFuture, +) DATE_FORMATS = [ "%Y-%m-%dT%H:%M:%S.%fZ", @@ -13,16 +18,6 @@ DATE_FORMATS = [ "%Y-%m-%d %H:%M:%S.%f", ] -# for expiration tests. If headache, consider freezegun -RECOVERY_KEY_VALIDATION_DATETIME = "selfprivacy_api.models.tokens.recovery_key.datetime" -DEVICE_KEY_VALIDATION_DATETIME = "selfprivacy_api.models.tokens.new_device_key.datetime" - - -class NearFuture(datetime.datetime): - @classmethod - def now(cls): - return datetime.datetime.now() + datetime.timedelta(minutes=13) - def assert_original(client): new_tokens = rest_get_tokens_info(client)