add test

Author: maxweng-sentry

apps/worker/tasks/manual_trigger.py

@@ -8,7 +8,6 @@
 from database.models import Commit, Pull
 from database.models.reports import CommitReport, Upload
 from services.comparison import get_or_create_comparison
-from services.processing.state import ProcessingState
 from shared.celery_config import (
     compute_comparison_task_name,
     manual_upload_completion_trigger_task_name,
@@ -97,26 +96,6 @@ def process_impl_within_lock(
         for upload in uploads:
             if not upload.state or upload.state_id == UploadState.UPLOADED.db_id:
                 still_processing += 1
-
-        # Also check Redis processing state to prevent race conditions
-        # where uploads have been marked complete in DB but are still
-        # being processed/merged by the finisher task
-        state = ProcessingState(repoid, commitid)
-        upload_numbers = state.get_upload_numbers()
-
-        if upload_numbers.processing > 0 or upload_numbers.processed > 0:
-            log.info(
-                "Retrying ManualTriggerTask. Redis shows uploads still being processed.",
-                extra={
-                    "repoid": repoid,
-                    "commitid": commitid,
-                    "redis_processing": upload_numbers.processing,
-                    "redis_processed": upload_numbers.processed,
-                    "db_still_processing": still_processing,
-                },
-            )
-            still_processing += upload_numbers.processing + upload_numbers.processed
-
         if still_processing == 0:
             self.trigger_notifications(repoid, commitid, commit_yaml)
             if commit.pullid:

apps/worker/tasks/tests/unit/test_manual_trigger.py

@@ -3,7 +3,6 @@
 
 from database.tests.factories import CommitFactory, PullFactory
 from database.tests.factories.core import UploadFactory
-from services.processing.state import UploadNumbers
 from shared.reports.enums import UploadState
 from tasks.manual_trigger import ManualTriggerTask
 
@@ -18,14 +17,6 @@ def test_manual_upload_completion_trigger(
         mock_redis,
         celery_app,
     ):
-        # Mock ProcessingState to return no pending uploads in Redis
-        mock_processing_state = mocker.patch("tasks.manual_trigger.ProcessingState")
-        mock_state_instance = mocker.MagicMock()
-        mock_state_instance.get_upload_numbers.return_value = UploadNumbers(
-            processing=0, processed=0
-        )
-        mock_processing_state.return_value = mock_state_instance
-
         mocked_app = mocker.patch.object(
             ManualTriggerTask,
             "app",
@@ -87,14 +78,6 @@ def test_manual_upload_completion_trigger_uploads_still_processing(
         mock_redis,
         celery_app,
     ):
-        # Mock ProcessingState to return no pending uploads in Redis
-        mock_processing_state = mocker.patch("tasks.manual_trigger.ProcessingState")
-        mock_state_instance = mocker.MagicMock()
-        mock_state_instance.get_upload_numbers.return_value = UploadNumbers(
-            processing=0, processed=0
-        )
-        mock_processing_state.return_value = mock_state_instance
-
         mocker.patch.object(
             ManualTriggerTask,
             "app",
@@ -122,47 +105,3 @@ def test_manual_upload_completion_trigger_uploads_still_processing(
                 "notifications_called": False,
                 "message": "Uploads are still in process and the task got retired so many times. Not triggering notifications.",
             } == result
-
-    def test_manual_upload_completion_trigger_redis_pending(
-        self,
-        mocker,
-        mock_configuration,
-        dbsession,
-        mock_storage,
-        mock_redis,
-        celery_app,
-    ):
-        """Test that task retries when Redis shows pending uploads even if DB shows complete"""
-        # Mock ProcessingState to return pending uploads in Redis
-        mock_processing_state = mocker.patch("tasks.manual_trigger.ProcessingState")
-        mock_state_instance = mocker.MagicMock()
-        mock_state_instance.get_upload_numbers.return_value = UploadNumbers(
-            processing=1,
-            processed=2,  # Redis shows 3 uploads still being processed/merged
-        )
-        mock_processing_state.return_value = mock_state_instance
-
-        mocker.patch.object(
-            ManualTriggerTask,
-            "app",
-            celery_app,
-        )
-        commit = CommitFactory.create()
-        # Upload is complete in DB
-        upload = UploadFactory.create(
-            report__commit=commit,
-            state="complete",
-            state_id=UploadState.PROCESSED.db_id,
-        )
-        dbsession.add(commit)
-        dbsession.add(upload)
-        dbsession.flush()
-
-        # Should retry because Redis shows pending uploads
-        with pytest.raises(Retry):
-            ManualTriggerTask().run_impl(
-                dbsession,
-                repoid=commit.repoid,
-                commitid=commit.commitid,
-                current_yaml={},
-            )

apps/worker/tasks/tests/unit/test_upload_finisher_task.py

@@ -1,3 +1,4 @@
+from datetime import UTC, datetime
 from pathlib import Path
 from unittest.mock import ANY, call
 
@@ -951,3 +952,49 @@ def test_generic_exception_handling(self, dbsession, mocker, mock_self_app):
                 "sentry_trace_id": None,
             }
         )
+
+    @pytest.mark.django_db
+    def test_upload_finisher_updates_repository_timestamp(
+        self,
+        mocker,
+        mock_configuration,
+        dbsession,
+        mock_storage,
+        mock_repo_provider,
+        mock_redis,
+        mock_self_app,
+    ):
+        """Test that repository.updatestamp is updated when None or old"""
+
+        mock_redis.scard.return_value = 0
+        mocker.patch("tasks.upload_finisher.load_intermediate_reports", return_value=[])
+        mocker.patch("tasks.upload_finisher.update_uploads")
+
+        # Create commit with repository that has no updatestamp
+        commit = CommitFactory.create(
+            message="test",
+            branch="main",
+            repository__branch="main",
+        )
+        # Ensure updatestamp is None
+        commit.repository.updatestamp = None
+        dbsession.add(commit)
+        dbsession.flush()
+
+        previous_results = [
+            {"upload_id": 0, "arguments": {"url": "test_url"}, "successful": True}
+        ]
+
+        result = UploadFinisherTask().run_impl(
+            dbsession,
+            previous_results,
+            repoid=commit.repoid,
+            commitid=commit.commitid,
+            commit_yaml={},
+        )
+
+        assert result == {"notifications_called": True}
+        dbsession.refresh(commit.repository)
+        # Repository timestamp should now be set
+        assert commit.repository.updatestamp is not None
+        assert (datetime.now(tz=UTC) - commit.repository.updatestamp).seconds < 60