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

Commit 2495164

Browse files
JerrySentryJerrySentry
authored
Merge branch 'main' into dec_10_mypy_1
2 parents d17ca30 + e3b3e49 commit 2495164

File tree

3 files changed

+33
-16
lines changed

3 files changed

+33
-16
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949
test:
5050
name: Test
5151
needs: [build]
52-
uses: codecov/gha-workflows/.github/workflows/[email protected].26
52+
uses: codecov/gha-workflows/.github/workflows/[email protected].27
5353
secrets: inherit
5454
with:
5555
repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
5656

5757
build-self-hosted:
5858
name: Build Self Hosted API
5959
needs: [build, test]
60-
uses: codecov/gha-workflows/.github/workflows/[email protected].26
60+
uses: codecov/gha-workflows/.github/workflows/[email protected].27
6161
secrets: inherit
6262
with:
6363
repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
@@ -66,7 +66,7 @@ jobs:
6666
name: Push Staging Image
6767
needs: [build, test]
6868
if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/staging' && github.repository_owner == 'codecov' }}
69-
uses: codecov/gha-workflows/.github/workflows/[email protected].26
69+
uses: codecov/gha-workflows/.github/workflows/[email protected].27
7070
secrets: inherit
7171
with:
7272
environment: staging
@@ -76,7 +76,7 @@ jobs:
7676
name: Push Production Image
7777
needs: [build, test]
7878
if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
79-
uses: codecov/gha-workflows/.github/workflows/[email protected].26
79+
uses: codecov/gha-workflows/.github/workflows/[email protected].27
8080
secrets: inherit
8181
with:
8282
environment: production
@@ -87,7 +87,7 @@ jobs:
8787
needs: [build-self-hosted, test]
8888
secrets: inherit
8989
if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
90-
uses: codecov/gha-workflows/.github/workflows/[email protected].26
90+
uses: codecov/gha-workflows/.github/workflows/[email protected].27
9191
with:
9292
push_rolling: true
9393
repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}

‎upload/tests/views/test_uploads.py‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ def test_uploads_post(db, mocker, mock_redis):
237237
)
238238
response_json = response.json()
239239
upload = ReportSession.objects.filter(
240-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
240+
report_id=commit_report.id,
241+
upload_extras={"format_version": "v1"},
242+
state="started",
241243
).first()
242244
assert response.status_code == 201
243245
assert all(
@@ -252,7 +254,9 @@ def test_uploads_post(db, mocker, mock_redis):
252254
)
253255

254256
assert ReportSession.objects.filter(
255-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
257+
report_id=commit_report.id,
258+
upload_extras={"format_version": "v1"},
259+
state="started",
256260
).exists()
257261
assert RepositoryFlag.objects.filter(
258262
repository_id=repository.repoid, flag_name="flag1"
@@ -348,7 +352,9 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_
348352
assert response.status_code == 201
349353
response_json = response.json()
350354
upload = ReportSession.objects.filter(
351-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
355+
report_id=commit_report.id,
356+
upload_extras={"format_version": "v1"},
357+
state="started",
352358
).first()
353359
assert all(
354360
map(
@@ -362,7 +368,9 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_
362368
)
363369

364370
assert ReportSession.objects.filter(
365-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
371+
report_id=commit_report.id,
372+
upload_extras={"format_version": "v1"},
373+
state="started",
366374
).exists()
367375
assert RepositoryFlag.objects.filter(
368376
repository_id=repository.repoid, flag_name="flag1"
@@ -496,7 +504,9 @@ def test_uploads_post_token_required_auth_check(
496504
assert response.status_code == 201
497505
response_json = response.json()
498506
upload = ReportSession.objects.filter(
499-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
507+
report_id=commit_report.id,
508+
upload_extras={"format_version": "v1"},
509+
state="started",
500510
).first()
501511
assert all(
502512
map(
@@ -510,7 +520,9 @@ def test_uploads_post_token_required_auth_check(
510520
)
511521

512522
assert ReportSession.objects.filter(
513-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
523+
report_id=commit_report.id,
524+
upload_extras={"format_version": "v1"},
525+
state="started",
514526
).exists()
515527
assert RepositoryFlag.objects.filter(
516528
repository_id=repository.repoid, flag_name="flag1"
@@ -626,7 +638,9 @@ def test_uploads_post_github_oidc_auth(
626638
assert response.status_code == 201
627639
response_json = response.json()
628640
upload = ReportSession.objects.filter(
629-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
641+
report_id=commit_report.id,
642+
upload_extras={"format_version": "v1"},
643+
state="started",
630644
).first()
631645
assert all(
632646
map(
@@ -640,7 +654,9 @@ def test_uploads_post_github_oidc_auth(
640654
)
641655

642656
assert ReportSession.objects.filter(
643-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
657+
report_id=commit_report.id,
658+
upload_extras={"format_version": "v1"},
659+
state="started",
644660
).exists()
645661
assert RepositoryFlag.objects.filter(
646662
repository_id=repository.repoid, flag_name="flag1"
@@ -754,7 +770,9 @@ def test_uploads_post_shelter(db, mocker, mock_redis):
754770
)
755771

756772
upload = ReportSession.objects.filter(
757-
report_id=commit_report.id, upload_extras={"format_version": "v1"}
773+
report_id=commit_report.id,
774+
upload_extras={"format_version": "v1"},
775+
state="started",
758776
).first()
759777
assert response.status_code == 201
760778
ArchiveService(repository)

‎upload/views/uploads.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ def create_upload(
5050
archive_service = ArchiveService(repository)
5151
# Create upload record
5252
instance: ReportSession = serializer.save(
53-
report_id=report.id,
54-
upload_extras={"format_version": "v1"},
53+
report_id=report.id, upload_extras={"format_version": "v1"}, state="started"
5554
)
5655

5756
# Inserts mirror upload record into measurements table. CLI hits this endpoint

0 commit comments

Comments
 (0)