From 26d0d69d469475e911f730739388a0ccfda2036c Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Tue, 4 Jun 2024 09:48:52 -0400 Subject: [PATCH 1/3] Making the test come back good. Signed-off-by: Cliff Hill --- tests/app/dao/test_service_sms_sender_dao.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/app/dao/test_service_sms_sender_dao.py b/tests/app/dao/test_service_sms_sender_dao.py index 50b2a71ff..90b21d0c0 100644 --- a/tests/app/dao/test_service_sms_sender_dao.py +++ b/tests/app/dao/test_service_sms_sender_dao.py @@ -164,11 +164,11 @@ def test_dao_update_service_sms_sender_switches_default(notify_db_session): .order_by(ServiceSmsSender.created_at) .all() ) + expected = {("testing", False), ("updated", True)} assert len(sms_senders) == 2 - assert sms_senders[0].sms_sender == "testing" - assert not sms_senders[0].is_default - assert sms_senders[1].sms_sender == "updated" - assert sms_senders[1].is_default + results = {(sender.sms_sender, sender.is_default) for sender in sms_senders} + for item in expected: + assert item in results def test_dao_update_service_sms_sender_raises_exception_when_no_default_after_update( From 952c04ad9ca66e67310a668cb1226a973d2951da Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Tue, 4 Jun 2024 12:49:31 -0400 Subject: [PATCH 2/3] Making things cleaner with set operators. Signed-off-by: Cliff Hill --- tests/app/dao/test_service_sms_sender_dao.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/app/dao/test_service_sms_sender_dao.py b/tests/app/dao/test_service_sms_sender_dao.py index 90b21d0c0..3d8ec6518 100644 --- a/tests/app/dao/test_service_sms_sender_dao.py +++ b/tests/app/dao/test_service_sms_sender_dao.py @@ -167,8 +167,7 @@ def test_dao_update_service_sms_sender_switches_default(notify_db_session): expected = {("testing", False), ("updated", True)} assert len(sms_senders) == 2 results = {(sender.sms_sender, sender.is_default) for sender in sms_senders} - for item in expected: - assert item in results + assert expected <= results def test_dao_update_service_sms_sender_raises_exception_when_no_default_after_update( From 77f4d85e744c6547605c81cb34f3dbe63d2d1a74 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Tue, 4 Jun 2024 16:08:40 -0400 Subject: [PATCH 3/3] Cleaning up the test a little. Signed-off-by: Cliff Hill --- tests/app/dao/test_service_sms_sender_dao.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/app/dao/test_service_sms_sender_dao.py b/tests/app/dao/test_service_sms_sender_dao.py index 3d8ec6518..9ca05e711 100644 --- a/tests/app/dao/test_service_sms_sender_dao.py +++ b/tests/app/dao/test_service_sms_sender_dao.py @@ -159,15 +159,11 @@ def test_dao_update_service_sms_sender_switches_default(notify_db_session): is_default=True, sms_sender="updated", ) - sms_senders = ( - ServiceSmsSender.query.filter_by(service_id=service.id) - .order_by(ServiceSmsSender.created_at) - .all() - ) + sms_senders = ServiceSmsSender.query.filter_by(service_id=service.id).all() + expected = {("testing", False), ("updated", True)} - assert len(sms_senders) == 2 results = {(sender.sms_sender, sender.is_default) for sender in sms_senders} - assert expected <= results + assert expected == results def test_dao_update_service_sms_sender_raises_exception_when_no_default_after_update(