remove datetime.utcnow()

This commit is contained in:
Kenneth Kehl
2024-05-23 13:59:51 -07:00
parent 752a13fbd2
commit 905df17f65
83 changed files with 591 additions and 570 deletions

View File

@@ -1,5 +1,5 @@
import uuid
from datetime import datetime, timedelta
from datetime import timedelta
import pytest
from freezegun import freeze_time
@@ -28,6 +28,7 @@ from app.dao.users_dao import (
from app.enums import AuthType, CodeType, PermissionType
from app.errors import InvalidRequest
from app.models import User, VerifyCode
from app.utils import utc_now
from tests.app.db import (
create_permissions,
create_service,
@@ -59,7 +60,7 @@ def test_create_user(notify_db_session, phone_number, expected_phone_number):
assert user_query.email_address == email
assert user_query.id == user.id
assert user_query.mobile_number == expected_phone_number
assert user_query.email_access_validated_at == datetime.utcnow()
assert user_query.email_access_validated_at == utc_now()
assert not user_query.platform_admin
@@ -146,8 +147,8 @@ def make_verify_code(user, age=None, expiry_age=None, code="12335", code_used=Fa
verify_code = VerifyCode(
code_type=CodeType.SMS,
_code=code,
created_at=datetime.utcnow() - (age or timedelta(hours=0)),
expiry_datetime=datetime.utcnow() - (expiry_age or timedelta(0)),
created_at=utc_now() - (age or timedelta(hours=0)),
expiry_datetime=utc_now() - (expiry_age or timedelta(0)),
user=user,
code_used=code_used,
)
@@ -172,16 +173,16 @@ def test_update_user_attribute(client, sample_user, user_attribute, user_value):
@freeze_time("2020-01-24T12:00:00")
def test_update_user_password(notify_api, notify_db_session, sample_user):
sample_user.password_changed_at = datetime.utcnow() - timedelta(days=1)
sample_user.password_changed_at = utc_now() - timedelta(days=1)
password = "newpassword"
assert not sample_user.check_password(password)
update_user_password(sample_user, password)
assert sample_user.check_password(password)
assert sample_user.password_changed_at == datetime.utcnow()
assert sample_user.password_changed_at == utc_now()
def test_count_user_verify_codes(sample_user):
with freeze_time(datetime.utcnow() + timedelta(hours=1)):
with freeze_time(utc_now() + timedelta(hours=1)):
make_verify_code(sample_user, code_used=True)
make_verify_code(sample_user, expiry_age=timedelta(hours=2))
[make_verify_code(sample_user) for i in range(5)]