Fix test

Author: spalmurray

upload/tests/views/test_upload_coverage.py

@@ -104,6 +104,9 @@ def test_upload_coverage_post(db, mocker):
     upload_task_mock = mocker.patch(
         "upload.views.uploads.trigger_upload_task", return_value=True
     )
+    amplitude_mock = mocker.patch(
+        "shared.events.amplitude.AmplitudeEventPublisher.publish"
+    )
 
     repository = RepositoryFactory(
         name="the_repo1", author__username="codecov", author__service="github"
@@ -151,6 +154,17 @@ def test_upload_coverage_post(db, mocker):
         response_json.get("url")
         == f"{settings.CODECOV_DASHBOARD_URL}/{repository.author.service}/{repository.author.username}/{repository.name}/commit/{commit.commitid}"
     )
+    amplitude_mock.assert_called_with(
+        "Upload Received",
+        {
+            "user_ownerid": commit.author.ownerid,
+            "ownerid": commit.repository.author.ownerid,
+            "repoid": commit.repository.repoid,
+            "commitid": commit.id,
+            "pullid": commit.pullid,
+            "upload_type": "Coverage report",
+        },
+    )
 
     assert ReportSession.objects.filter(
         report__commit=commit,

upload/tests/views/test_uploads.py

@@ -314,9 +314,6 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_
         "upload.views.uploads.trigger_upload_task", return_value=True
     )
     analytics_service_mock = mocker.patch("upload.views.uploads.AnalyticsService")
-    amplitude_mock = mocker.patch(
-        "shared.events.amplitude.AmplitudeEventPublisher.publish"
-    )
 
     repository = RepositoryFactory(
         name="the_repo",
@@ -434,17 +431,6 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_
                 "uploader_type": "CLI",
             },
         )
-        amplitude_mock.assert_called_with(
-            "Upload Received",
-            {
-                "user_ownerid": commit.author.ownerid,
-                "ownerid": commit.repository.author.ownerid,
-                "repoid": commit.repository.repoid,
-                "commitid": commit.id,
-                "pullid": commit.pullid,
-                "upload_type": "Coverage report",
-            },
-        )
     else:
         assert response.status_code == 401
         assert response.json().get("detail") == "Not valid tokenless upload"
@@ -473,9 +459,6 @@ def test_uploads_post_token_required_auth_check(
         "upload.views.uploads.trigger_upload_task", return_value=True
     )
     analytics_service_mock = mocker.patch("upload.views.uploads.AnalyticsService")
-    amplitude_mock = mocker.patch(
-        "shared.events.amplitude.AmplitudeEventPublisher.publish"
-    )
 
     repository = RepositoryFactory(
         name="the_repo",
@@ -600,31 +583,18 @@ def test_uploads_post_token_required_auth_check(
                 "uploader_type": "CLI",
             },
         )
-        amplitude_mock.assert_called_with(
-            "Upload Received",
-            {
-                "user_ownerid": commit.author.ownerid,
-                "ownerid": commit.repository.author.ownerid,
-                "repoid": commit.repository.repoid,
-                "commitid": commit.id,
-                "pullid": commit.pullid,
-                "upload_type": "Coverage report",
-            },
-        )
     else:
         assert response.status_code == 401
         assert response.json().get("detail") == "Not valid tokenless upload"
 
 
-@patch("shared.events.amplitude.AmplitudeEventPublisher.publish")
 @patch("upload.views.uploads.AnalyticsService")
 @patch("upload.helpers.jwt.decode")
 @patch("upload.helpers.PyJWKClient")
 def test_uploads_post_github_oidc_auth(
     mock_jwks_client,
     mock_jwt_decode,
     analytics_service_mock,
-    amplitude_mock,
     db,
     mocker,
     mock_redis,
@@ -747,17 +717,6 @@ def test_uploads_post_github_oidc_auth(
             "uploader_type": "CLI",
         },
     )
-    amplitude_mock.assert_called_with(
-        "Upload Received",
-        {
-            "user_ownerid": commit.author.ownerid,
-            "ownerid": commit.repository.author.ownerid,
-            "repoid": commit.repository.repoid,
-            "commitid": commit.id,
-            "pullid": commit.pullid,
-            "upload_type": "Coverage report",
-        },
-    )
 
 
 @override_settings(SHELTER_SHARED_SECRET="shelter-shared-secret")