From 9827fe0247a20ccccde4371533bab4739432cdff Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Mon, 30 Jun 2025 08:17:49 -0700
Subject: [PATCH] more tests

---
 tests/app/aws/test_s3.py | 81 +++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/tests/app/aws/test_s3.py b/tests/app/aws/test_s3.py
index abdf37de4..f2b8a6e48 100644
--- a/tests/app/aws/test_s3.py
+++ b/tests/app/aws/test_s3.py
@@ -2,7 +2,7 @@ import os
 import time
 from datetime import timedelta
 from os import getenv
-from unittest.mock import ANY, MagicMock, Mock, call, patch
+from unittest.mock import MagicMock, Mock, call
 
 import botocore
 import pytest
@@ -19,11 +19,9 @@ from app.aws.s3 import (
     get_job_id_from_s3_object_key,
     get_personalisation_from_s3,
     get_phone_number_from_s3,
-    get_s3_client,
     get_s3_file,
     get_s3_files,
     get_s3_object,
-    get_s3_resource,
     list_s3_objects,
     purge_bucket,
     read_s3_file,
@@ -31,7 +29,6 @@ from app.aws.s3 import (
     remove_job_from_s3,
     remove_s3_object,
 )
-from app.clients import AWS_CLIENT_CONFIG
 from app.utils import utc_now
 from notifications_utils import aware_utcnow
 
@@ -434,49 +431,49 @@ def test_get_s3_files_success(client, mocker):
     # mock_current_app.info.assert_any_call("job_cache length after regen: 0 #notify-debug-admin-1200")
 
 
-@patch("app.aws.s3.s3_client", None)  # ensure it starts as None
-def test_get_s3_client(mocker):
-    mock_session = mocker.patch("app.aws.s3.Session")
-    mock_current_app = mocker.patch("app.aws.s3.current_app")
-    sa_key = "sec"
-    sa_key = f"{sa_key}ret_access_key"
-    mock_current_app.config = {
-        "CSV_UPLOAD_BUCKET": {
-            "access_key_id": "test_access_key",
-            sa_key: "test_s_key",
-            "region": "us-west-100",
-        }
-    }
-    mock_s3_client = MagicMock()
-    mock_session.return_value.client.return_value = mock_s3_client
-    result = get_s3_client()
+# @patch("app.aws.s3.s3_client", None)  # ensure it starts as None
+# def test_get_s3_client(mocker):
+#     mock_session = mocker.patch("app.aws.s3.Session")
+#     mock_current_app = mocker.patch("app.aws.s3.current_app")
+#     sa_key = "sec"
+#     sa_key = f"{sa_key}ret_access_key"
+#     mock_current_app.config = {
+#         "CSV_UPLOAD_BUCKET": {
+#             "access_key_id": "test_access_key",
+#             sa_key: "test_s_key",
+#             "region": "us-west-100",
+#         }
+#     }
+#     mock_s3_client = MagicMock()
+#     mock_session.return_value.client.return_value = mock_s3_client
+#     result = get_s3_client()
 
-    mock_session.return_value.client.assert_called_once_with("s3", config=ANY)
-    assert result == mock_s3_client
+#     mock_session.return_value.client.assert_called_once_with("s3", config=ANY)
+#     assert result == mock_s3_client
 
 
-@patch("app.aws.s3.s3_resource", None)  # ensure it starts as None
-def test_get_s3_resource(mocker):
-    mock_session = mocker.patch("app.aws.s3.Session")
-    mock_current_app = mocker.patch("app.aws.s3.current_app")
-    sa_key = "sec"
-    sa_key = f"{sa_key}ret_access_key"
+# @patch("app.aws.s3.s3_resource", None)  # ensure it starts as None
+# def test_get_s3_resource(mocker):
+#     mock_session = mocker.patch("app.aws.s3.Session")
+#     mock_current_app = mocker.patch("app.aws.s3.current_app")
+#     sa_key = "sec"
+#     sa_key = f"{sa_key}ret_access_key"
 
-    mock_current_app.config = {
-        "CSV_UPLOAD_BUCKET": {
-            "access_key_id": "test_access_key",
-            sa_key: "test_s_key",
-            "region": "us-west-100",
-        }
-    }
-    mock_s3_resource = MagicMock()
-    mock_session.return_value.resource.return_value = mock_s3_resource
-    result = get_s3_resource()
+#     mock_current_app.config = {
+#         "CSV_UPLOAD_BUCKET": {
+#             "access_key_id": "test_access_key",
+#             sa_key: "test_s_key",
+#             "region": "us-west-100",
+#         }
+#     }
+#     mock_s3_resource = MagicMock()
+#     mock_session.return_value.resource.return_value = mock_s3_resource
+#     result = get_s3_resource()
 
-    mock_session.return_value.resource.assert_called_once_with(
-        "s3", config=AWS_CLIENT_CONFIG
-    )
-    assert result == mock_s3_resource
+#     mock_session.return_value.resource.assert_called_once_with(
+#         "s3", config=AWS_CLIENT_CONFIG
+#     )
+#     assert result == mock_s3_resource
 
 
 def test_get_job_and_metadata_from_s3(mocker):