From 2d5ac51c06e4df8c2df8ea0e06bc18ff998d7bb0 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Fri, 8 Mar 2024 15:40:02 +0300 Subject: [PATCH] fix: future mock are now more in the future --- tests/common.py | 16 ++++++++-------- tests/test_graphql/test_api_recovery.py | 12 ++++++------ tests/test_repository/test_tokens_repository.py | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/common.py b/tests/common.py index ae3f0d0..09a9cd5 100644 --- a/tests/common.py +++ b/tests/common.py @@ -7,16 +7,16 @@ RECOVERY_KEY_VALIDATION_DATETIME = "selfprivacy_api.models.tokens.time.datetime" DEVICE_KEY_VALIDATION_DATETIME = RECOVERY_KEY_VALIDATION_DATETIME -def ten_minutes_into_future_naive(): - return datetime.now() + timedelta(minutes=10) +def ten_hours_into_future_naive(): + return datetime.now() + timedelta(hours=10) -def ten_minutes_into_future_naive_utc(): - return datetime.utcnow() + timedelta(minutes=10) +def ten_hours_into_future_naive_utc(): + return datetime.utcnow() + timedelta(hours=10) -def ten_minutes_into_future(): - return datetime.now(timezone.utc) + timedelta(minutes=10) +def ten_hours_into_future(): + return datetime.now(timezone.utc) + timedelta(hours=10) def ten_minutes_into_past_naive(): @@ -34,11 +34,11 @@ def ten_minutes_into_past(): class NearFuture(datetime): @classmethod def now(cls, tz=None): - return datetime.now(tz) + timedelta(minutes=13) + return datetime.now(tz) + timedelta(hours=13) @classmethod def utcnow(cls): - return datetime.utcnow() + timedelta(minutes=13) + return datetime.utcnow() + timedelta(hours=13) def read_json(file_path): diff --git a/tests/test_graphql/test_api_recovery.py b/tests/test_graphql/test_api_recovery.py index ea44640..02bb630 100644 --- a/tests/test_graphql/test_api_recovery.py +++ b/tests/test_graphql/test_api_recovery.py @@ -14,9 +14,9 @@ from tests.common import ( ) # Graphql API's output should be timezone-naive -from tests.common import ten_minutes_into_future_naive_utc as ten_minutes_into_future -from tests.common import ten_minutes_into_future as ten_minutes_into_future_tz -from tests.common import ten_minutes_into_past_naive_utc as ten_minutes_into_past +from tests.common import ten_hours_into_future_naive_utc as ten_hours_into_future +from tests.common import ten_hours_into_future as ten_hours_into_future_tz +from tests.common import ten_minutes_into_past_naive_utc as ten_hours_into_past from tests.test_graphql.common import ( assert_empty, @@ -168,7 +168,7 @@ def test_graphql_generate_recovery_key(client, authorized_client): @pytest.mark.parametrize( - "expiration_date", [ten_minutes_into_future(), ten_minutes_into_future_tz()] + "expiration_date", [ten_hours_into_future(), ten_hours_into_future_tz()] ) def test_graphql_generate_recovery_key_with_expiration_date( client, authorized_client, expiration_date: datetime @@ -193,7 +193,7 @@ def test_graphql_generate_recovery_key_with_expiration_date( def test_graphql_use_recovery_key_after_expiration(client, authorized_client, mocker): - expiration_date = ten_minutes_into_future() + expiration_date = ten_hours_into_future() key = graphql_make_new_recovery_key(authorized_client, expires_at=expiration_date) # Timewarp to after it expires @@ -219,7 +219,7 @@ def test_graphql_use_recovery_key_after_expiration(client, authorized_client, mo def test_graphql_generate_recovery_key_with_expiration_in_the_past(authorized_client): - expiration_date = ten_minutes_into_past() + expiration_date = ten_hours_into_past() response = request_make_new_recovery_key( authorized_client, expires_at=expiration_date ) diff --git a/tests/test_repository/test_tokens_repository.py b/tests/test_repository/test_tokens_repository.py index 0ffc76b..999a813 100644 --- a/tests/test_repository/test_tokens_repository.py +++ b/tests/test_repository/test_tokens_repository.py @@ -24,7 +24,7 @@ from selfprivacy_api.repositories.tokens.abstract_tokens_repository import ( AbstractTokensRepository, ) -from tests.common import ten_minutes_into_past, ten_minutes_into_future +from tests.common import ten_minutes_into_past, ten_hours_into_future ORIGINAL_DEVICE_NAMES = [