remove dead code

tests/app/test_errors.py

@@ -1,6 +0,0 @@
-from app.errors import VirusScanError
-
-
-def test_virus_scan_error():
-    vse = VirusScanError("a message")
-    assert "a message" in vse.args

tests/app/test_utils.py

@@ -1,4 +1,4 @@
-import uuid
+# import uuid
 from datetime import date, datetime
 
 import pytest
@@ -6,12 +6,8 @@ from freezegun import freeze_time
 
 from app.enums import ServicePermissionType
 from app.utils import (
-    format_sequential_number,
-    get_midnight_for_day_before,
     get_midnight_in_utc,
     get_public_notify_type_text,
-    get_reference_from_personalisation,
-    get_uuid_string_or_none,
     midnight_n_days_ago,
     scrub,
 )
@@ -32,16 +28,16 @@ def test_get_midnight_in_utc_returns_expected_date(date, expected_date):
     assert get_midnight_in_utc(date) == expected_date
 
 
-@pytest.mark.parametrize(
-    "date, expected_date",
-    [
-        (datetime(2016, 1, 15, 0, 30), datetime(2016, 1, 14, 0, 0)),
-        (datetime(2016, 7, 15, 0, 0), datetime(2016, 7, 14, 0, 0)),
-        (datetime(2016, 8, 23, 11, 59), datetime(2016, 8, 22, 0, 0)),
-    ],
-)
-def test_get_midnight_for_day_before_returns_expected_date(date, expected_date):
-    assert get_midnight_for_day_before(date) == expected_date
+# @pytest.mark.parametrize(
+#     "date, expected_date",
+#     [
+#         (datetime(2016, 1, 15, 0, 30), datetime(2016, 1, 14, 0, 0)),
+#         (datetime(2016, 7, 15, 0, 0), datetime(2016, 7, 14, 0, 0)),
+#         (datetime(2016, 8, 23, 11, 59), datetime(2016, 8, 22, 0, 0)),
+#     ],
+# )
+# def test_get_midnight_for_day_before_returns_expected_date(date, expected_date):
+#     assert get_midnight_for_day_before(date) == expected_date
 
 
 @pytest.mark.parametrize(
@@ -66,27 +62,27 @@ def test_midnight_n_days_ago(current_time, arg, expected_datetime):
         assert midnight_n_days_ago(arg) == expected_datetime
 
 
-def test_format_sequential_number():
-    assert format_sequential_number(123) == "0000007b"
+# def test_format_sequential_number():
+#     assert format_sequential_number(123) == "0000007b"
 
 
-@pytest.mark.parametrize(
-    "personalisation, expected_response",
-    [
-        ({"nothing": "interesting"}, None),
-        ({"reference": "something"}, "something"),
-        (None, None),
-    ],
-)
-def test_get_reference_from_personalisation(personalisation, expected_response):
-    assert get_reference_from_personalisation(personalisation) == expected_response
+# @pytest.mark.parametrize(
+#     "personalisation, expected_response",
+#     [
+#         ({"nothing": "interesting"}, None),
+#         ({"reference": "something"}, "something"),
+#         (None, None),
+#     ],
+# )
+# def test_get_reference_from_personalisation(personalisation, expected_response):
+#     assert get_reference_from_personalisation(personalisation) == expected_response
 
 
-def test_get_uuid_string_or_none():
-    my_uuid = uuid.uuid4()
-    assert str(my_uuid) == get_uuid_string_or_none(my_uuid)
+# def test_get_uuid_string_or_none():
+#     my_uuid = uuid.uuid4()
+#     assert str(my_uuid) == get_uuid_string_or_none(my_uuid)
 
-    assert get_uuid_string_or_none(None) is None
+#     assert get_uuid_string_or_none(None) is None
 
 
 def test_get_public_notify_type_text():

tests/app/user/test_rest.py

@@ -632,135 +632,135 @@ def test_remove_user_folder_permissions(admin_request, sample_user, sample_servi
     assert service_user.folders == []
 
 
-@freeze_time("2016-01-01 11:09:00.061258")
-def test_send_user_reset_password_should_send_reset_password_link(
-    admin_request, sample_user, mocker, password_reset_email_template
-):
-    mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
-    data = {"email": sample_user.email_address}
-    notify_service = password_reset_email_template.service
+# @freeze_time("2016-01-01 11:09:00.061258")
+# def test_send_user_reset_password_should_send_reset_password_link(
+#     admin_request, sample_user, mocker, password_reset_email_template
+# ):
+#     mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
+#     data = {"email": sample_user.email_address}
+#     notify_service = password_reset_email_template.service
 
-    admin_request.post(
-        "user.send_user_reset_password",
-        _data=data,
-        _expected_status=204,
-    )
+#     admin_request.post(
+#         "user.send_user_reset_password",
+#         _data=data,
+#         _expected_status=204,
+#     )
 
-    notification = Notification.query.first()
-    mocked.assert_called_once_with(
-        [str(notification.id)], queue="notify-internal-tasks"
-    )
-    assert (
-        notification.reply_to_text
-        == notify_service.get_default_reply_to_email_address()
-    )
+#     notification = Notification.query.first()
+#     mocked.assert_called_once_with(
+#         [str(notification.id)], queue="notify-internal-tasks"
+#     )
+#     assert (
+#         notification.reply_to_text
+#         == notify_service.get_default_reply_to_email_address()
+#     )
 
 
-@pytest.mark.parametrize(
-    "data, expected_url",
-    (
-        (
-            {
-                "email": "notify@digital.fake.gov",
-            },
-            ("http://localhost:6012/new-password/"),
-        ),
-        (
-            {
-                "email": "notify@digital.fake.gov",
-                "admin_base_url": "https://different.example.com",
-            },
-            ("https://different.example.com/new-password/"),
-        ),
-    ),
-)
-@freeze_time("2016-01-01 11:09:00.061258")
-def test_send_user_reset_password_should_use_provided_base_url(
-    admin_request,
-    sample_user,
-    password_reset_email_template,
-    mocker,
-    data,
-    expected_url,
-):
-    mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
+# @pytest.mark.parametrize(
+#     "data, expected_url",
+#     (
+#         (
+#             {
+#                 "email": "notify@digital.fake.gov",
+#             },
+#             ("http://localhost:6012/new-password/"),
+#         ),
+#         (
+#             {
+#                 "email": "notify@digital.fake.gov",
+#                 "admin_base_url": "https://different.example.com",
+#             },
+#             ("https://different.example.com/new-password/"),
+#         ),
+#     ),
+# )
+# @freeze_time("2016-01-01 11:09:00.061258")
+# def test_send_user_reset_password_should_use_provided_base_url(
+#     admin_request,
+#     sample_user,
+#     password_reset_email_template,
+#     mocker,
+#     data,
+#     expected_url,
+# ):
+#     mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
 
-    admin_request.post(
-        "user.send_user_reset_password",
-        _data=data,
-        _expected_status=204,
-    )
+#     admin_request.post(
+#         "user.send_user_reset_password",
+#         _data=data,
+#         _expected_status=204,
+#     )
 
-    assert Notification.query.first().personalisation["url"].startswith(expected_url)
+#     assert Notification.query.first().personalisation["url"].startswith(expected_url)
 
 
-@freeze_time("2016-01-01 11:09:00.061258")
-def test_send_user_reset_password_reset_password_link_contains_redirect_link_if_present_in_request(
-    admin_request, sample_user, mocker, password_reset_email_template
-):
-    mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
-    data = {"email": sample_user.email_address, "next": "blob"}
+# @freeze_time("2016-01-01 11:09:00.061258")
+# def test_send_user_reset_password_reset_password_link_contains_redirect_link_if_present_in_request(
+#     admin_request, sample_user, mocker, password_reset_email_template
+# ):
+#     mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
+#     data = {"email": sample_user.email_address, "next": "blob"}
 
-    admin_request.post(
-        "user.send_user_reset_password",
-        _data=data,
-        _expected_status=204,
-    )
+#     admin_request.post(
+#         "user.send_user_reset_password",
+#         _data=data,
+#         _expected_status=204,
+#     )
 
-    notification = Notification.query.first()
-    assert "?next=blob" in notification.content
-    mocked.assert_called_once_with(
-        [str(notification.id)], queue="notify-internal-tasks"
-    )
+#     notification = Notification.query.first()
+#     assert "?next=blob" in notification.content
+#     mocked.assert_called_once_with(
+#         [str(notification.id)], queue="notify-internal-tasks"
+#     )
 
 
-def test_send_user_reset_password_should_return_400_when_email_is_missing(
-    admin_request, mocker
-):
-    mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
-    data = {}
+# def test_send_user_reset_password_should_return_400_when_email_is_missing(
+#     admin_request, mocker
+# ):
+#     mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
+#     data = {}
 
-    json_resp = admin_request.post(
-        "user.send_user_reset_password",
-        _data=data,
-        _expected_status=400,
-    )
-    assert json_resp["message"] == {"email": ["Missing data for required field."]}
-    assert mocked.call_count == 0
+#     json_resp = admin_request.post(
+#         "user.send_user_reset_password",
+#         _data=data,
+#         _expected_status=400,
+#     )
+#     assert json_resp["message"] == {"email": ["Missing data for required field."]}
+#     assert mocked.call_count == 0
 
 
-def test_send_user_reset_password_should_return_400_when_user_doesnot_exist(
-    admin_request, mocker
-):
-    mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
-    bad_email_address = "bad@email.gov.uk"
-    data = {"email": bad_email_address}
+# def test_send_user_reset_password_should_return_400_when_user_doesnot_exist(
+#     admin_request, mocker
+# ):
+#     mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
+#     bad_email_address = "bad@email.gov.uk"
+#     data = {"email": bad_email_address}
 
-    json_resp = admin_request.post(
-        "user.send_user_reset_password",
-        _data=data,
-        _expected_status=404,
-    )
+#     json_resp = admin_request.post(
+#         "user.send_user_reset_password",
+#         _data=data,
+#         _expected_status=404,
+#     )
 
-    assert json_resp["message"] == "No result found"
-    assert mocked.call_count == 0
+#     assert json_resp["message"] == "No result found"
+#     assert mocked.call_count == 0
 
 
-def test_send_user_reset_password_should_return_400_when_data_is_not_email_address(
-    admin_request, mocker
-):
-    mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
-    bad_email_address = "bad.email.gov.uk"
-    data = {"email": bad_email_address}
+# def test_send_user_reset_password_should_return_400_when_data_is_not_email_address(
+#     admin_request, mocker
+# ):
+#     mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
+#     bad_email_address = "bad.email.gov.uk"
+#     data = {"email": bad_email_address}
 
-    json_resp = admin_request.post(
-        "user.send_user_reset_password",
-        _data=data,
-        _expected_status=400,
-    )
+#     json_resp = admin_request.post(
+#         "user.send_user_reset_password",
+#         _data=data,
+#         _expected_status=400,
+#     )
 
-    assert json_resp["message"] == {"email": ["Not a valid email address"]}
-    assert mocked.call_count == 0
+#     assert json_resp["message"] == {"email": ["Not a valid email address"]}
+#     assert mocked.call_count == 0
 
 
 def test_send_already_registered_email(
@@ -842,25 +842,25 @@ def test_send_user_confirm_new_email_returns_400_when_email_missing(
     mocked.assert_not_called()
 
 
-@freeze_time("2020-02-14T12:00:00")
-def test_update_user_password_saves_correctly(admin_request, sample_service):
-    sample_user = sample_service.users[0]
-    new_password = "1234567890"
-    data = {"_password": "1234567890"}
+# @freeze_time("2020-02-14T12:00:00")
+# def test_update_user_password_saves_correctly(admin_request, sample_service):
+#     sample_user = sample_service.users[0]
+#     new_password = "1234567890"
+#     data = {"_password": "1234567890"}
 
-    json_resp = admin_request.post(
-        "user.update_password", user_id=str(sample_user.id), _data=data
-    )
+#     json_resp = admin_request.post(
+#         "user.update_password", user_id=str(sample_user.id), _data=data
+#     )
 
-    assert json_resp["data"]["password_changed_at"] is not None
-    data = {"password": new_password}
+#     assert json_resp["data"]["password_changed_at"] is not None
+#     data = {"password": new_password}
 
-    admin_request.post(
-        "user.verify_user_password",
-        user_id=str(sample_user.id),
-        _data=data,
-        _expected_status=204,
-    )
+#     admin_request.post(
+#         "user.verify_user_password",
+#         user_id=str(sample_user.id),
+#         _data=data,
+#         _expected_status=204,
+#     )
 
 
 def test_activate_user(admin_request, sample_user):