From 53019995d1ff7595b5bf90bc4fb5163819de5fdb Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Mon, 14 Nov 2022 14:53:28 -0500 Subject: [PATCH] more time test times --- app/celery/nightly_tasks.py | 2 +- tests/app/celery/test_nightly_tasks.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/celery/nightly_tasks.py b/app/celery/nightly_tasks.py index 0e18a946c..2f7a1207d 100644 --- a/app/celery/nightly_tasks.py +++ b/app/celery/nightly_tasks.py @@ -302,7 +302,7 @@ def save_daily_notification_processing_time(est_date=None): result = dao_get_notifications_processing_time_stats(start_time, end_time) insert_update_processing_time( FactProcessingTime( - est_date=est_date, + bst_date=est_date, messages_total=result.messages_total, messages_within_10_secs=result.messages_within_10_secs ) diff --git a/tests/app/celery/test_nightly_tasks.py b/tests/app/celery/test_nightly_tasks.py index 8c6a2e485..4105a4c49 100644 --- a/tests/app/celery/test_nightly_tasks.py +++ b/tests/app/celery/test_nightly_tasks.py @@ -419,8 +419,8 @@ def test_save_daily_notification_processing_time_when_in_est(mocker, sample_temp # notification counted and sent within 10 seconds create_notification( sample_template, - created_at=datetime(2021, 4, 16, 23, 00), - sent_at=datetime(2021, 4, 16, 23, 00) + timedelta(seconds=5) + created_at=datetime(2021, 4, 17, 4, 00), + sent_at=datetime(2021, 4, 17, 4, 00) + timedelta(seconds=5) ) # notification counted and sent within 10 seconds create_notification( @@ -431,8 +431,8 @@ def test_save_daily_notification_processing_time_when_in_est(mocker, sample_temp # notification created too late to be counted create_notification( sample_template, - created_at=datetime(2021, 4, 17, 23, 00), - sent_at=datetime(2021, 4, 17, 23, 00) + timedelta(seconds=15) + created_at=datetime(2021, 4, 18, 23, 00), + sent_at=datetime(2021, 4, 18, 23, 00) + timedelta(seconds=15) ) save_daily_notification_processing_time(date_provided) @@ -444,7 +444,7 @@ def test_save_daily_notification_processing_time_when_in_est(mocker, sample_temp assert persisted_to_db[0].messages_within_10_secs == 2 -@freeze_time('2021-06-05 03:00') +@freeze_time('2021-06-05 08:00') def test_delete_notifications_task_calls_task_for_services_with_data_retention_of_same_type(notify_db_session, mocker): sms_service = create_service(service_name='a') email_service = create_service(service_name='b') @@ -462,7 +462,7 @@ def test_delete_notifications_task_calls_task_for_services_with_data_retention_o 'service_id': sms_service.id, 'notification_type': 'sms', # three days of retention, its morn of 5th, so we want to keep all messages from 4th, 3rd and 2nd. - 'datetime_to_delete_before': datetime(2021, 6, 1, 23, 0), + 'datetime_to_delete_before': datetime(2021, 6, 2, 4, 0), }) @@ -485,12 +485,12 @@ def test_delete_notifications_task_calls_task_for_services_with_data_retention_b call(queue=ANY, kwargs={ 'service_id': service_14_days.id, 'notification_type': 'sms', - 'datetime_to_delete_before': datetime(2021, 3, 22, 0, 0) + 'datetime_to_delete_before': datetime(2021, 3, 21, 4, 0) }), call(queue=ANY, kwargs={ 'service_id': service_3_days.id, 'notification_type': 'sms', - 'datetime_to_delete_before': datetime(2021, 4, 1, 23, 0) + 'datetime_to_delete_before': datetime(2021, 4, 1, 4, 0) }), ]) @@ -528,11 +528,11 @@ def test_delete_notifications_task_calls_task_for_services_that_have_sent_notifi call(queue=ANY, kwargs={ 'service_id': service_will_delete_1.id, 'notification_type': 'sms', - 'datetime_to_delete_before': datetime(2021, 3, 27, 0, 0) + 'datetime_to_delete_before': datetime(2021, 3, 26, 4, 0) }), call(queue=ANY, kwargs={ 'service_id': service_will_delete_2.id, 'notification_type': 'sms', - 'datetime_to_delete_before': datetime(2021, 3, 27, 0, 0) + 'datetime_to_delete_before': datetime(2021, 3, 26, 4, 0) }), ])