Use shared report_service and test factories (#849)

Author: Swatinem

api/internal/commit/serializers.py

@@ -1,9 +1,9 @@
 import logging
 
+import shared.reports.api_report_service as report_service
 from rest_framework import serializers
 from shared.reports.types import TOTALS_MAP
 
-import services.report as report_service
 from api.internal.owner.serializers import OwnerSerializer
 from api.shared.commit.serializers import CommitTotalsSerializer
 from core.models import Commit

api/internal/tests/test_charts.py

@@ -13,6 +13,7 @@
 from pytz import UTC
 from rest_framework.exceptions import ValidationError
 from rest_framework.reverse import reverse
+from shared.django_apps.core.tests.factories import OwnerFactory, RepositoryFactory
 
 from api.internal.chart.filters import apply_default_filters, apply_simple_filters
 from api.internal.chart.helpers import (
@@ -23,7 +24,6 @@
 )
 from codecov.tests.base_test import InternalAPITest
 from core.models import Commit
-from core.tests.factories import OwnerFactory, RepositoryFactory
 from utils.test_utils import Client
 
 fake = faker.Faker()
@@ -56,7 +56,7 @@ def generate_random_totals(
 def setup_commits(
     repo,
     num_commits,
-    branch="master",
+    branch="main",
     start_date=None,
     meets_default_filters=True,
     **kwargs,
@@ -251,7 +251,7 @@ def test_apply_simple_filters(self):
         end_date = datetime.now()
         data = {
             "owner_username": self.org1.username,
-            "branch": "master",
+            "branch": "main",
             "start_date": start_date.isoformat(),
             "end_date": end_date.isoformat(),
             "repositories": [self.repo1_org1.name, self.repo2_org1.name],
@@ -318,7 +318,7 @@ def test_apply_simple_filters_branch_filtering(self):
         for commit in queryset:
             assert (
                 commit.repository.name == self.repo1_org1.name
-                and commit.branch == "master"
+                and commit.branch == "main"
             ) or (
                 commit.repository.name == branch_test.name and commit.branch == "main"
             )
@@ -860,7 +860,7 @@ def setUp(self):
 
     def test_no_permissions(self, mocked_get_permissions):
         data = {
-            "branch": "master",
+            "branch": "main",
             "start_date": timezone.now() - timedelta(7),
             "end_date": timezone.now(),
             "grouping_unit": "commit",
@@ -879,7 +879,7 @@ def test_no_permissions(self, mocked_get_permissions):
     @pytest.mark.skip(reason="flaky, skipping until re write")
     def test_get_commits_no_time_grouping(self, mocked_get_permissions):
         data = {
-            "branch": "master",
+            "branch": "main",
             "start_date": timezone.now() - timedelta(7),
             "end_date": timezone.now(),
             "grouping_unit": "commit",
@@ -897,7 +897,7 @@ def test_get_commits_no_time_grouping(self, mocked_get_permissions):
 
     def test_get_commits_with_time_grouping(self, mocked_get_permissions):
         data = {
-            "branch": "master",
+            "branch": "main",
             "start_date": timezone.now() - timedelta(7),
             "end_date": timezone.now(),
             "grouping_unit": "day",
@@ -917,7 +917,7 @@ def test_get_commits_with_time_grouping(self, mocked_get_permissions):
 
     def test_get_commits_with_coverage_change(self, mocked_get_permissions):
         data = {
-            "branch": "master",
+            "branch": "main",
             "start_date": timezone.now() - timedelta(7),
             "end_date": timezone.now(),
             "grouping_unit": "day",

api/internal/tests/test_feature.py

@@ -3,13 +3,13 @@
 import pytest
 from django.urls import reverse
 from rest_framework.test import APITestCase
+from shared.django_apps.core.tests.factories import OwnerFactory
 from shared.django_apps.rollouts.models import (
     FeatureFlag,
     FeatureFlagVariant,
     RolloutUniverse,
 )
 
-from codecov_auth.tests.factories import OwnerFactory
 from utils.test_utils import Client
 
 

api/internal/tests/test_pagination.py

@@ -1,7 +1,7 @@
 from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
+from shared.django_apps.core.tests.factories import OwnerFactory
 
-from codecov_auth.tests.factories import OwnerFactory
 from utils.test_utils import Client
 
 

api/internal/tests/test_permissions.py

@@ -2,14 +2,13 @@
 
 from django.test import TestCase, override_settings
 from rest_framework.exceptions import APIException
+from shared.django_apps.core.tests.factories import OwnerFactory, RepositoryFactory
 
 from api.internal.tests.test_utils import (
     GetAdminErrorProviderAdapter,
     GetAdminProviderAdapter,
 )
 from api.shared.permissions import RepositoryPermissionsService, UserIsAdminPermissions
-from codecov_auth.tests.factories import OwnerFactory
-from core.tests.factories import RepositoryFactory
 
 
 class MockedPermissionsAdapter:

api/internal/tests/test_repo_accessors.py

@@ -1,11 +1,10 @@
 from unittest.mock import patch
 
 from django.test import TestCase
+from shared.django_apps.core.tests.factories import OwnerFactory, RepositoryFactory
 from shared.torngit.exceptions import TorngitClientError, TorngitClientGeneralError
 
 from api.shared.repo.repository_accessors import RepoAccessors
-from codecov_auth.tests.factories import OwnerFactory
-from core.tests.factories import RepositoryFactory
 
 
 class RepositoryAccessorsTestCase(TestCase):

api/internal/tests/test_views.py

@@ -3,15 +3,15 @@
 
 from rest_framework import status
 from rest_framework.reverse import reverse
-
-from codecov.tests.base_test import InternalAPITest
-from codecov_auth.tests.factories import OwnerFactory
-from core.tests.factories import (
+from shared.django_apps.core.tests.factories import (
     BranchFactory,
     CommitFactory,
+    OwnerFactory,
     PullFactory,
     RepositoryFactory,
 )
+
+from codecov.tests.base_test import InternalAPITest
 from utils.test_utils import Client
 
 get_permissions_method = (

api/internal/tests/unit/views/test_compare_flags_view.py

@@ -2,16 +2,20 @@
 from unittest.mock import PropertyMock, patch
 
 from rest_framework.reverse import reverse
+from shared.django_apps.core.tests.factories import (
+    CommitWithReportFactory,
+    PullFactory,
+    RepositoryFactory,
+)
 from shared.reports.types import ReportTotals
 
 from codecov.tests.base_test import InternalAPITest
-from core.tests.factories import CommitWithReportFactory, PullFactory, RepositoryFactory
 
 current_file = Path(__file__)
 
 
 @patch("services.comparison.Comparison.git_comparison", new_callable=PropertyMock)
-@patch("services.archive.ArchiveService.read_chunks")
+@patch("shared.api_archive.archive.ArchiveService.read_chunks")
 @patch("shared.reports.filtered.FilteredReport.apply_diff")
 @patch(
     "api.shared.repo.repository_accessors.RepoAccessors.get_repo_permissions",
@@ -83,8 +87,7 @@ def test_compare_flags___success(
         )
 
         assert response.status_code == 200
-
-        expected_result = [
+        assert response.data == [
             {
                 "name": "unittests",
                 "base_report_totals": {
@@ -189,18 +192,6 @@ def test_compare_flags___success(
             },
         ]
 
-        assert (
-            response.data[0]["base_report_totals"]
-            == expected_result[0]["base_report_totals"]
-        )
-        assert (
-            response.data[0]["head_report_totals"]
-            == expected_result[0]["head_report_totals"]
-        )
-        assert response.data[0] == expected_result[0]
-        assert response.data[1] == expected_result[1]
-        assert response.data == expected_result
-
     def test_compare_flags_with_report_with_cff_and_non_cff(
         self, diff_totals_mock, read_chunks_mock, git_comparison_mock
     ):
@@ -210,6 +201,12 @@ def test_compare_flags_with_report_with_cff_and_non_cff(
             parent_commit_id=self.parent_commit.commitid,
             repository=self.repo,
         )
+        report = commit_with_custom_reports._report
+        report["sessions"]["0"].update(
+            st="carriedforward",
+            se={"carriedforward_from": "56e05fced214c44a37759efa2dfc25a65d8ae98d"},
+        )
+        commit_with_custom_reports.save()
 
         upload = (
             commit_with_custom_reports.reports.first()
@@ -222,14 +219,6 @@ def test_compare_flags_with_report_with_cff_and_non_cff(
         }
         upload.save()
 
-        upload = (
-            commit_with_custom_reports.reports.first()
-            .sessions.filter(flags__flag_name="integrations")
-            .first()
-        )
-        upload.upload_type = "uploaded"
-        upload.save()
-
         head_chunks = open(
             current_file.parent.parent.parent
             / f"samples/{commit_with_custom_reports.commitid}_chunks.txt",

api/internal/tests/unit/views/test_compare_view.py

@@ -3,17 +3,17 @@
 
 from rest_framework import status
 from rest_framework.reverse import reverse
-
-from api.internal.commit.serializers import CommitTotalsSerializer
-from codecov.tests.base_test import InternalAPITest
-from codecov_auth.tests.factories import OwnerFactory
-from core.tests.factories import (
+from shared.django_apps.core.tests.factories import (
     BranchFactory,
     CommitWithReportFactory,
+    OwnerFactory,
     PullFactory,
     RepositoryFactory,
 )
 
+from api.internal.commit.serializers import CommitTotalsSerializer
+from codecov.tests.base_test import InternalAPITest
+
 
 def build_commits(client):
     """
@@ -46,7 +46,7 @@ def build_commits(client):
     return repo, commit_base, commit_head
 
 
-@patch("services.archive.ArchiveService.read_chunks", lambda obj, sha: "")
+@patch("shared.api_archive.archive.ArchiveService.read_chunks", lambda obj, sha: "")
 @patch(
     "api.shared.repo.repository_accessors.RepoAccessors.get_repo_permissions",
     lambda self, repo, user: (True, True),

api/internal/tests/views/test_account_viewset.py

@@ -11,12 +11,13 @@
 from shared.django_apps.codecov_auth.tests.factories import (
     AccountFactory,
     InvoiceBillingFactory,
+    OwnerFactory,
+    UserFactory,
 )
 from stripe import StripeError
 
 from api.internal.tests.test_utils import GetAdminProviderAdapter
 from codecov_auth.models import Service
-from codecov_auth.tests.factories import OwnerFactory, UserFactory
 from plan.constants import PlanName, TrialStatus
 from utils.test_utils import APIClient