From 4ed6ca1601ae17c8c7461ad9533f3e33e9672df0 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Wed, 23 Oct 2019 12:00:34 +0100 Subject: [PATCH 1/2] remove loadtesting from the database --- .../0308_delete_loadtesting_provider.py | 39 +++++++++++++++++++ tests/app/dao/test_provider_details_dao.py | 7 +--- tests/app/provider_details/test_rest.py | 3 +- 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 migrations/versions/0308_delete_loadtesting_provider.py diff --git a/migrations/versions/0308_delete_loadtesting_provider.py b/migrations/versions/0308_delete_loadtesting_provider.py new file mode 100644 index 000000000..55daf9ce1 --- /dev/null +++ b/migrations/versions/0308_delete_loadtesting_provider.py @@ -0,0 +1,39 @@ +""" +Remove loadtesting provider + +Revision ID: 0308_delete_loadtesting_provider +Revises: 0307_delete_dm_datetime +Create Date: 2019-10-22 17:30 + +""" +import uuid +from alembic import op +from sqlalchemy.sql import text + +revision = '0308_delete_loadtesting_provider' +down_revision = '0307_delete_dm_datetime' + + +def upgrade(): + conn = op.get_bind() + conn.execute("DELETE FROM provider_details WHERE identifier = 'loadtesting'") + conn.execute("DELETE FROM provider_details_history WHERE identifier = 'loadtesting'") + + +def downgrade(): + conn = op.get_bind() + conn.execute( + text(""" + INSERT INTO + provider_details + (id, display_name, identifier, priority, notification_type, active, version, supports_international) + VALUES + (:uuid, 'Loadtesting', 'loadtesting', 100, 'sms', true, 1, false); + INSERT INTO + provider_details_history + (id, display_name, identifier, priority, notification_type, active, version, supports_international) + VALUES + (:uuid, 'Loadtesting', 'loadtesting', 100, 'sms', true, 1, false) + """), + uuid=uuid.uuid4() + ) diff --git a/tests/app/dao/test_provider_details_dao.py b/tests/app/dao/test_provider_details_dao.py index 153f39a2e..21b671a65 100644 --- a/tests/app/dao/test_provider_details_dao.py +++ b/tests/app/dao/test_provider_details_dao.py @@ -326,9 +326,6 @@ def test_dao_get_provider_stats(notify_db_session): assert result[2].active is True assert result[2].current_month_billable_sms == 5 - assert result[3].identifier == 'loadtesting' + assert result[3].identifier == 'dvla' assert result[3].current_month_billable_sms == 0 - - assert result[4].identifier == 'dvla' - assert result[4].current_month_billable_sms == 0 - assert result[4].supports_international is False + assert result[3].supports_international is False diff --git a/tests/app/provider_details/test_rest.py b/tests/app/provider_details/test_rest.py index fd9428e47..2bbf92bdf 100644 --- a/tests/app/provider_details/test_rest.py +++ b/tests/app/provider_details/test_rest.py @@ -20,8 +20,7 @@ def test_get_provider_details_in_type_and_identifier_order(client, notify_db): assert json_resp[0]['identifier'] == 'ses' assert json_resp[1]['identifier'] == 'mmg' assert json_resp[2]['identifier'] == 'firetext' - assert json_resp[3]['identifier'] == 'loadtesting' - assert json_resp[4]['identifier'] == 'dvla' + assert json_resp[3]['identifier'] == 'dvla' def test_get_provider_details_by_id(client, notify_db): From 59f1ce940ddbe81bf1575cbc7ef9e4cc3b25e2b1 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 31 Oct 2019 13:51:40 +0000 Subject: [PATCH 2/2] update tests to reflect no loadtesting provider --- tests/app/dao/test_provider_details_dao.py | 4 ++-- tests/app/provider_details/test_rest.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/app/dao/test_provider_details_dao.py b/tests/app/dao/test_provider_details_dao.py index 21b671a65..20b662d36 100644 --- a/tests/app/dao/test_provider_details_dao.py +++ b/tests/app/dao/test_provider_details_dao.py @@ -38,7 +38,7 @@ def set_primary_sms_provider(identifier): def test_can_get_sms_non_international_providers(restore_provider_details): sms_providers = get_provider_details_by_notification_type('sms') - assert len(sms_providers) == 3 + assert len(sms_providers) == 2 assert all('sms' == prov.notification_type for prov in sms_providers) @@ -307,7 +307,7 @@ def test_dao_get_provider_stats(notify_db_session): result = dao_get_provider_stats() - assert len(result) == 5 + assert len(result) == 4 assert result[0].identifier == 'ses' assert result[0].display_name == 'AWS SES' diff --git a/tests/app/provider_details/test_rest.py b/tests/app/provider_details/test_rest.py index 2bbf92bdf..b096d8daf 100644 --- a/tests/app/provider_details/test_rest.py +++ b/tests/app/provider_details/test_rest.py @@ -15,7 +15,7 @@ def test_get_provider_details_in_type_and_identifier_order(client, notify_db): ) assert response.status_code == 200 json_resp = json.loads(response.get_data(as_text=True))['provider_details'] - assert len(json_resp) == 5 + assert len(json_resp) == 4 assert json_resp[0]['identifier'] == 'ses' assert json_resp[1]['identifier'] == 'mmg' @@ -54,7 +54,7 @@ def test_get_provider_contains_correct_fields(client, sample_service, sample_tem "active", "updated_at", "supports_international", "current_month_billable_sms" } - assert len(json_resp) == 5 + assert len(json_resp) == 4 assert allowed_keys == set(json_resp[0].keys())