upstream/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2026-05-28 11:14:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

forgery: refactor pull_merge_test

Browse source
This commit is contained in:
oliverpool 2026-05-28 12:12:14 +02:00
parent c155197908
commit 805a9c4ec0
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/integration/pull_merge_test.go
View file

@ -49,6 +49,7 @@ import (
commitstatus_service "forgejo.org/services/repository/commitstatus" commitstatus_service "forgejo.org/services/repository/commitstatus"
webhook_service "forgejo.org/services/webhook" webhook_service "forgejo.org/services/webhook"
"forgejo.org/tests" "forgejo.org/tests"
"forgejo.org/tests/forgery"
"github.com/hashicorp/go-version" "github.com/hashicorp/go-version"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -1269,8 +1270,9 @@ func TestMergeConcurrency(t *testing.T) {
// been run up to 50 without errors. // been run up to 50 without errors.
concurrentCount := 5 concurrentCount := 5
repo, _, deferrer := tests.CreateDeclarativeRepo(t, user2, "concurrency-test", nil, nil, nil) repo := forgery.CreateRepository(t, user2, &forgery.CreateRepositoryOptions{
defer deferrer() Files: forgery.FilesInit{},
})
// Create labels for the PRs... // Create labels for the PRs...
labelNames := []string{"bug", "super-important", "tricky", "deadlock"} labelNames := []string{"bug", "super-important", "tricky", "deadlock"}
@ -1395,8 +1397,9 @@ func TestMergeHTTPRequestCancellation(t *testing.T) {
measuredMergeTime := 283 * time.Millisecond // time measured on a test system for one POST /%s/%s/pulls/%d/merge measuredMergeTime := 283 * time.Millisecond // time measured on a test system for one POST /%s/%s/pulls/%d/merge
cancellationDuration := measuredMergeTime / time.Duration(cancellationChecks) // cancel after (i+1) * cancellationDuration for each PR cancellationDuration := measuredMergeTime / time.Duration(cancellationChecks) // cancel after (i+1) * cancellationDuration for each PR
repo, _, deferrer := tests.CreateDeclarativeRepo(t, user2, "concurrency-test", nil, nil, nil) repo := forgery.CreateRepository(t, user2, &forgery.CreateRepositoryOptions{
defer deferrer() Files: forgery.FilesInit{},
})
bulkCreatePRs(t, cancellationChecks, repo, token, nil, 0) bulkCreatePRs(t, cancellationChecks, repo, token, nil, 0)