From 38fc4efc99f0e222c887fc723fed9c8f87cb81a0 Mon Sep 17 00:00:00 2001 From: nakamura1878 Date: Fri, 4 Apr 2025 12:49:23 +0900 Subject: [PATCH] S3Hook: remove error return on inactivity period check --- .../src/airflow/providers/amazon/aws/hooks/s3.py | 4 ---- .../amazon/tests/unit/amazon/aws/hooks/test_s3.py | 10 ++++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/providers/amazon/src/airflow/providers/amazon/aws/hooks/s3.py b/providers/amazon/src/airflow/providers/amazon/aws/hooks/s3.py index 754207019179b..5455bc102735b 100644 --- a/providers/amazon/src/airflow/providers/amazon/aws/hooks/s3.py +++ b/providers/amazon/src/airflow/providers/amazon/aws/hooks/s3.py @@ -790,10 +790,6 @@ async def is_keys_unchanged_async( "FAILURE: Inactivity Period passed, not enough objects found in %s", path, ) - return { - "status": "error", - "message": f"FAILURE: Inactivity Period passed, not enough objects found in {path}", - } return { "status": "pending", "previous_objects": previous_objects, diff --git a/providers/amazon/tests/unit/amazon/aws/hooks/test_s3.py b/providers/amazon/tests/unit/amazon/aws/hooks/test_s3.py index af4b77fffcf86..bb5859516137f 100644 --- a/providers/amazon/tests/unit/amazon/aws/hooks/test_s3.py +++ b/providers/amazon/tests/unit/amazon/aws/hooks/test_s3.py @@ -913,9 +913,10 @@ async def test_s3_key_hook_is_keys_unchanged_async_handle_tzinfo(self, mock_list @pytest.mark.asyncio @async_mock.patch("airflow.providers.amazon.aws.triggers.s3.S3Hook._list_keys_async") - async def test_s3_key_hook_is_keys_unchanged_inactivity_error_async(self, mock_list_keys): + async def test_s3_key_hook_is_keys_unchanged_inactivity_async(self, mock_list_keys): """ - Test is_key_unchanged gives AirflowException. + Test is_key_unchanged gives False response when the key value is unchanged in specified period + and not enough objects found. """ mock_list_keys.return_value = [] @@ -934,10 +935,7 @@ async def test_s3_key_hook_is_keys_unchanged_inactivity_error_async(self, mock_l last_activity_time=None, ) - assert response == { - "status": "error", - "message": "FAILURE: Inactivity Period passed, not enough objects found in test_bucket/test", - } + assert response.get("status") == "pending" @pytest.mark.asyncio @async_mock.patch("airflow.providers.amazon.aws.triggers.s3.S3Hook._list_keys_async")