Skip to content
This repository was archived by the owner on May 5, 2025. It is now read-only.

Commit ace92d6

Browse files
authored
Change combined-upload to upload-coverage for clarity (#986)
1 parent ff80060 commit ace92d6

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

upload/tests/views/test_combined_upload.py renamed to upload/tests/views/test_upload_coverage.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
UploadFlagMembership,
1616
)
1717
from services.archive import ArchiveService, MinioEndpoints
18-
from upload.views.combined_upload import CanDoCoverageUploadsPermission
18+
from upload.views.upload_coverage import CanDoCoverageUploadsPermission
1919

2020

2121
def test_get_repo(db):
@@ -25,7 +25,7 @@ def test_get_repo(db):
2525
repository.save()
2626
repo_slug = f"{repository.author.username}::::{repository.name}"
2727
url = reverse(
28-
"new_upload.combined_upload",
28+
"new_upload.upload_coverage",
2929
args=[repository.author.service, repo_slug],
3030
)
3131
client = APIClient()
@@ -42,7 +42,7 @@ def test_get_repo_not_found(upload, db):
4242
)
4343
repo_slug = "codecov::::wrong-repo-name"
4444
url = reverse(
45-
"new_upload.combined_upload",
45+
"new_upload.upload_coverage",
4646
args=[repository.author.service, repo_slug],
4747
)
4848
client = APIClient()
@@ -63,7 +63,7 @@ def test_deactivated_repo(db):
6363
repository.save()
6464
repo_slug = f"{repository.author.username}::::{repository.name}"
6565
url = reverse(
66-
"new_upload.combined_upload",
66+
"new_upload.upload_coverage",
6767
args=[repository.author.service, repo_slug],
6868
)
6969
client = APIClient()
@@ -73,11 +73,11 @@ def test_deactivated_repo(db):
7373
assert "This repository is deactivated" in str(response.json())
7474

7575

76-
def test_combined_upload_with_errors(db):
76+
def test_upload_coverage_with_errors(db):
7777
repository = RepositoryFactory()
7878
repo_slug = f"{repository.author.username}::::{repository.name}"
7979
url = reverse(
80-
"new_upload.combined_upload",
80+
"new_upload.upload_coverage",
8181
args=[repository.author.service, repo_slug],
8282
)
8383

@@ -97,7 +97,7 @@ def test_combined_upload_with_errors(db):
9797
assert "flags" in response.json()
9898

9999

100-
def test_combined_upload_post(db, mocker):
100+
def test_upload_coverage_post(db, mocker):
101101
mocker.patch.object(
102102
CanDoCoverageUploadsPermission, "has_permission", return_value=True
103103
)
@@ -121,7 +121,7 @@ def test_combined_upload_post(db, mocker):
121121
client.force_authenticate(user=owner)
122122
repo_slug = f"{repository.author.username}::::{repository.name}"
123123
url = reverse(
124-
"new_upload.combined_upload",
124+
"new_upload.upload_coverage",
125125
args=[repository.author.service, repo_slug],
126126
)
127127
response = client.post(
@@ -195,7 +195,7 @@ def test_combined_upload_post(db, mocker):
195195

196196

197197
@override_settings(SHELTER_SHARED_SECRET="shelter-shared-secret")
198-
def test_combined_upload_post_shelter(db, mocker):
198+
def test_upload_coverage_post_shelter(db, mocker):
199199
mocker.patch.object(
200200
CanDoCoverageUploadsPermission, "has_permission", return_value=True
201201
)
@@ -219,7 +219,7 @@ def test_combined_upload_post_shelter(db, mocker):
219219
client.force_authenticate(user=owner)
220220
repo_slug = f"{repository.author.username}::::{repository.name}"
221221
url = reverse(
222-
"new_upload.combined_upload",
222+
"new_upload.upload_coverage",
223223
args=[repository.author.service, repo_slug],
224224
)
225225
response = client.post(

upload/urls.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from django.urls import path, re_path
22

33
from upload.views.bundle_analysis import BundleAnalysisView
4-
from upload.views.combined_upload import CombinedUploadView
54
from upload.views.commits import CommitViews
65
from upload.views.empty_upload import EmptyUploadView
76
from upload.views.legacy import UploadDownloadHandler, UploadHandler
87
from upload.views.reports import ReportResultsView, ReportViews
98
from upload.views.test_results import TestResultsView
109
from upload.views.upload_completion import UploadCompletionView
10+
from upload.views.upload_coverage import UploadCoverageView
1111
from upload.views.uploads import UploadViews
1212

1313
urlpatterns = [
@@ -59,9 +59,9 @@
5959
name="new_upload.commits",
6060
),
6161
path(
62-
"<str:service>/<str:repo>/combined-upload",
63-
CombinedUploadView.as_view(),
64-
name="new_upload.combined_upload",
62+
"<str:service>/<str:repo>/upload-coverage",
63+
UploadCoverageView.as_view(),
64+
name="new_upload.upload_coverage",
6565
),
6666
# This was getting in the way of the new endpoints, so I moved to the end
6767
re_path(r"(?P<version>\w+)/?", UploadHandler.as_view(), name="upload-handler"),

upload/views/combined_upload.py renamed to upload/views/upload_coverage.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
log = logging.getLogger(__name__)
3838

3939

40-
class CombinedUploadView(APIView, GetterMixin):
40+
class UploadCoverageView(APIView, GetterMixin):
4141
permission_classes = [CanDoCoverageUploadsPermission]
4242
authentication_classes = [
4343
UploadTokenRequiredAuthenticationCheck,
@@ -57,7 +57,7 @@ def emit_metrics(self, position: str) -> None:
5757
API_UPLOAD_COUNTER,
5858
labels=generate_upload_prometheus_metrics_labels(
5959
action="coverage",
60-
endpoint="combined_upload",
60+
endpoint="upload_coverage",
6161
request=self.request,
6262
is_shelter_request=self.is_shelter_request(),
6363
position=position,
@@ -85,7 +85,7 @@ def post(self, request: HttpRequest, *args, **kwargs) -> Response:
8585
commit = create_commit(commit_serializer, repository)
8686

8787
log.info(
88-
"Request to create new combined upload",
88+
"Request to create new coverage upload",
8989
extra=dict(
9090
repo=repository.name,
9191
commit=commit.commitid,

0 commit comments

Comments
 (0)