try fixing tests

Author: Swatinem

api/internal/tests/test_charts.py

@@ -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"
             )

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

@@ -15,7 +15,7 @@
 
 
 @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",

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

@@ -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_repo_view.py

@@ -726,7 +726,7 @@ def test_retrieve_with_no_commits_doesnt_crash(self, mocked_get_permissions):
         response = self._retrieve()
         assert response.status_code == 200
 
-    @patch("services.archive.ArchiveService.read_chunks", lambda obj, _: "")
+    @patch("shared.api_archive.archive.ArchiveService.read_chunks", lambda obj, _: "")
     def test_retrieve_returns_latest_commit_data(self, mocked_get_permissions):
         self.maxDiff = None
         mocked_get_permissions.return_value = True, True
@@ -803,7 +803,7 @@ def test_retrieve_returns_latest_commit_data(self, mocked_get_permissions):
             ],
         )
 
-    @patch("services.archive.ArchiveService.read_chunks", lambda obj, _: "")
+    @patch("shared.api_archive.archive.ArchiveService.read_chunks", lambda obj, _: "")
     def test_retrieve_returns_latest_commit_of_default_branch_if_branch_not_specified(
         self, mocked_get_permissions
     ):
@@ -817,7 +817,7 @@ def test_retrieve_returns_latest_commit_of_default_branch_if_branch_not_specifie
         assert response.data["latest_commit"]["commitid"] == commit.commitid
         assert response.data["latest_commit"]["commitid"] != more_recent_commit.commitid
 
-    @patch("services.archive.ArchiveService.read_chunks", lambda obj, _: "")
+    @patch("shared.api_archive.archive.ArchiveService.read_chunks", lambda obj, _: "")
     def test_retrieve_accepts_branch_query_param_to_specify_latest_commit(
         self, mocked_get_permissions
     ):
@@ -831,7 +831,7 @@ def test_retrieve_accepts_branch_query_param_to_specify_latest_commit(
         assert response.data["latest_commit"]["commitid"] == commit.commitid
         assert response.data["latest_commit"]["commitid"] != more_recent_commit.commitid
 
-    @patch("services.archive.ArchiveService.read_chunks", lambda obj, _: "")
+    @patch("shared.api_archive.archive.ArchiveService.read_chunks", lambda obj, _: "")
     def test_latest_commit_is_none_if_dne(self, mocked_get_permissions):
         mocked_get_permissions.return_value = True, True
 

api/public/v2/tests/test_api_compare_viewset.py

@@ -875,7 +875,7 @@ def setUp(self):
         self.client.force_login_owner(self.current_owner)
 
     @patch("shared.reports.api_report_service.build_report_from_commit")
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     @patch("services.repo_providers.RepoProviderService.get_adapter")
     def test_impacted_files_200_found(
         self, adapter_mock, read_file, build_report_from_commit
@@ -911,7 +911,7 @@ def test_impacted_files_200_found(
         assert data["state"] == "processed"
 
     @patch("shared.reports.api_report_service.build_report_from_commit")
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     @patch("services.repo_providers.RepoProviderService.get_adapter")
     @patch("services.task.TaskService.compute_comparison")
     @patch("api.shared.compare.serializers.ComparisonSerializer.get_files")
@@ -954,7 +954,7 @@ def test_impacted_files_200_not_found(
 
     @patch("services.comparison.Comparison.validate")
     @patch("services.comparison.PullRequestComparison.get_file_comparison")
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     @patch("services.repo_providers.RepoProviderService.get_adapter")
     def test_impacted_file_segment_found(
         self, adapter_mock, read_file, mock_get_file_comparison, mock_compare_validate
@@ -992,7 +992,7 @@ def test_impacted_file_segment_found(
     @patch("services.task.TaskService.compute_comparison")
     @patch("services.comparison.Comparison.validate")
     @patch("services.comparison.PullRequestComparison.get_file_comparison")
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     @patch("services.repo_providers.RepoProviderService.get_adapter")
     def test_impacted_file_segment_not_found(
         self,

api/public/v2/tests/test_api_repo_viewset.py

@@ -57,7 +57,7 @@ def test_list(self):
                         "name": self.org.name,
                     },
                     "language": self.repo.language,
-                    "branch": "master",
+                    "branch": "main",
                     "active": False,
                     "activated": False,
                     "totals": {
@@ -110,7 +110,7 @@ def test_retrieve(self, get_repo_permissions):
                 "name": self.org.name,
             },
             "language": self.repo.language,
-            "branch": "master",
+            "branch": "main",
             "active": False,
             "activated": False,
             "totals": {

compare/commands/compare/interactors/tests/test_fetch_impacted_files.py

@@ -362,7 +362,7 @@ def execute(self, owner, *args):
         service = owner.service if owner else "github"
         return FetchImpactedFiles(owner, service).execute(*args)
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_file_sort_function(self, read_file):
         read_file.return_value = mock_data_from_archive
         parameter = ImpactedFileParameter.CHANGE_COVERAGE
@@ -372,7 +372,7 @@ def test_impacted_file_sort_function(self, read_file):
         sorted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in sorted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_file_sort_function_no_misses(self, read_file):
         read_file.return_value = mock_data_without_misses
         parameter = ImpactedFileParameter.MISSES_COUNT
@@ -382,7 +382,7 @@ def test_impacted_file_sort_function_no_misses(self, read_file):
         sorted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in sorted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_file_sort_function_error(self, read_file):
         read_file.return_value = mock_data_from_archive
         parameter = "something else"
@@ -396,7 +396,7 @@ def test_impacted_file_sort_function_error(self, read_file):
             "invalid impacted file parameter: something else", str(ctx.exception)
         )
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_change_coverage_ascending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -409,7 +409,7 @@ def test_impacted_files_filtered_by_change_coverage_ascending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_change_coverage_descending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -422,7 +422,7 @@ def test_impacted_files_filtered_by_change_coverage_descending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileB", "fileA"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_head_coverage_ascending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -435,7 +435,7 @@ def test_impacted_files_filtered_by_head_coverage_ascending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_patch_coverage_ascending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -448,7 +448,7 @@ def test_impacted_files_filtered_by_patch_coverage_ascending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_patch_coverage_descending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -461,7 +461,7 @@ def test_impacted_files_filtered_by_patch_coverage_descending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileB", "fileA"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_head_coverage_descending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -474,7 +474,7 @@ def test_impacted_files_filtered_by_head_coverage_descending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileB", "fileA"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_head_name_ascending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -487,7 +487,7 @@ def test_impacted_files_filtered_by_head_name_ascending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_head_name_descending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -500,7 +500,7 @@ def test_impacted_files_filtered_by_head_name_descending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileB", "fileA"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_misses_count_ascending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -513,7 +513,7 @@ def test_impacted_files_filtered_by_misses_count_ascending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_misses_count_descending(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -526,15 +526,15 @@ def test_impacted_files_filtered_by_misses_count_descending(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileB", "fileA"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_without_filters(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {}
         comparison = None
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_unintended_changes(self, read_file):
         read_file.return_value = mock_data_from_archive
         filters = {
@@ -548,7 +548,7 @@ def test_impacted_files_filtered_by_unintended_changes(self, read_file):
         impacted_files = self.execute(None, self.comparison_report, comparison, filters)
         assert [file.head_name for file in impacted_files] == ["fileA", "fileB"]
 
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_unintended_changes_set_to_false(
         self, read_file
     ):
@@ -565,7 +565,7 @@ def test_impacted_files_filtered_by_unintended_changes_set_to_false(
         assert [file.head_name for file in impacted_files] == ["fileA", "fileB"]
 
     @patch("services.comparison.Comparison.head_report", new_callable=PropertyMock)
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_flags_and_commit_comparison_for_pull(
         self, read_file, build_report_from_commit_mock
     ):
@@ -606,7 +606,7 @@ def test_impacted_files_filtered_by_flags_and_commit_comparison_for_pull(
         assert impacted_files[0].head_name == "fileA"
 
     @patch("services.comparison.Comparison.head_report", new_callable=PropertyMock)
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_flags_and_commit_comparison_for_parent_commit(
         self, read_file, build_report_from_commit_mock
     ):
@@ -640,7 +640,7 @@ def test_impacted_files_filtered_by_flags_and_commit_comparison_for_parent_commi
 
     @patch("services.components.commit_components")
     @patch("services.comparison.Comparison.head_report", new_callable=PropertyMock)
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_components_and_commit_comparison_for_parent_commit(
         self, read_file, build_report_from_commit_mock, commit_components_mock
     ):
@@ -683,7 +683,7 @@ def test_impacted_files_filtered_by_components_and_commit_comparison_for_parent_
 
     @patch("services.components.commit_components")
     @patch("services.comparison.Comparison.head_report", new_callable=PropertyMock)
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_components_using_flags(
         self, read_file, build_report_from_commit_mock, commit_components_mock
     ):
@@ -732,7 +732,7 @@ def test_impacted_files_filtered_by_components_using_flags(
 
     @patch("services.components.commit_components")
     @patch("services.comparison.Comparison.head_report", new_callable=PropertyMock)
-    @patch("services.archive.ArchiveService.read_file")
+    @patch("shared.api_archive.archive.ArchiveService.read_file")
     def test_impacted_files_filtered_by_components_and_flags_commit_comparison_for_parent_commit(
         self, read_file, build_report_from_commit_mock, commit_components_mock
     ):

core/commands/branch/interactors/tests/test_fetch_branches.py

@@ -15,7 +15,7 @@ class FetchRepoBranchesInteractorTest(TransactionTestCase):
     def setUp(self):
         self.org = OwnerFactory(username="codecov")
         self.repo = RepositoryFactory(
-            author=self.org, name="gazebo", private=False, branch="master"
+            author=self.org, name="gazebo", private=False, branch="main"
         )
         self.head = CommitFactory(repository=self.repo)
         self.commit = CommitFactory(repository=self.repo)
@@ -32,7 +32,7 @@ def test_fetch_branches(self):
         repository = self.repo
         filters = {}
         branches = async_to_sync(self.execute)(None, repository, filters)
-        assert any(branch.name == "master" for branch in branches)
+        assert any(branch.name == "main" for branch in branches)
         assert any(branch.name == "test1" for branch in branches)
         assert any(branch.name == "test2" for branch in branches)
         assert len(branches) == 3

graphql_api/tests/test_branch.py

@@ -219,7 +219,7 @@ def test_fetch_branches(self):
         assert branches == [
             {"node": {"name": "test2"}},
             {"node": {"name": "test1"}},
-            {"node": {"name": "master"}},
+            {"node": {"name": "main"}},
         ]
 
     def test_fetch_branches_with_filters(self):

graphql_api/tests/test_components_legacy.py

@@ -4,13 +4,17 @@
 from django.conf import settings
 from django.test import TransactionTestCase, override_settings
 from django.utils import timezone
+from shared.django_apps.core.tests.factories import (
+    CommitFactory,
+    PullFactory,
+    RepositoryFactory,
+)
 from shared.reports.resources import Report, ReportFile, ReportLine
 from shared.utils.sessions import Session
 
 from codecov_auth.tests.factories import OwnerFactory
 from compare.models import CommitComparison
 from compare.tests.factories import CommitComparisonFactory, ComponentComparisonFactory
-from core.tests.factories import CommitFactory, PullFactory, RepositoryFactory
 from services.comparison import MissingComparisonReport
 from services.components import Component
 from timeseries.models import MeasurementName