mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 00:28:17 +00:00
036f1eddc5
* Split TestPullRequest out of AddTestPullRequestTask
* Before scheduling the task, AddTestPullRequestTask stores the max
index of the repository
* When the task runs, it does not take into account pull requests that
have an index higher than the recorded max index
When AddTestPullRequestTask is called with isSync == true, it is the
direct consequence of a new commit being pushed. Forgejo knows nothing
of this new commit yet. If a PR is created later and its head
references the new commit, it will have an index that is higher and
must not be taken into account. It would be acting and triggering a
notification for a PR based on an event that happened before it
existed.
Refs: https://codeberg.org/forgejo/forgejo/issues/2009
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2236
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
(cherry picked from commit b3be895a30)
87 lines
2.7 KiB
Go
87 lines
2.7 KiB
Go
// Copyright 2024 The Forgejo Authors
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package integration
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/log"
|
|
repo_module "code.gitea.io/gitea/modules/repository"
|
|
"code.gitea.io/gitea/modules/test"
|
|
pull_service "code.gitea.io/gitea/services/pull"
|
|
repo_service "code.gitea.io/gitea/services/repository"
|
|
"code.gitea.io/gitea/tests"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestPullRequestSynchronized(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
// unmerged pull request of user2/repo1 from branch2 to master
|
|
pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 2})
|
|
// tip of tests/gitea-repositories-meta/user2/repo1 branch2
|
|
pull.HeadCommitID = "985f0301dba5e7b34be866819cd15ad3d8f508ee"
|
|
|
|
require.Equal(t, pull.HeadRepoID, pull.BaseRepoID)
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: pull.HeadRepoID})
|
|
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
|
|
|
|
t.Run("AddTestPullRequestTask", func(t *testing.T) {
|
|
logChecker, cleanup := test.NewLogChecker(log.DEFAULT, log.TRACE)
|
|
logChecker.Filter("Updating PR").StopMark("TestPullRequest ")
|
|
defer cleanup()
|
|
|
|
opt := &repo_module.PushUpdateOptions{
|
|
PusherID: owner.ID,
|
|
PusherName: owner.Name,
|
|
RepoUserName: owner.Name,
|
|
RepoName: repo.Name,
|
|
RefFullName: git.RefName("refs/heads/branch2"),
|
|
OldCommitID: pull.HeadCommitID,
|
|
NewCommitID: pull.HeadCommitID,
|
|
}
|
|
require.NoError(t, repo_service.PushUpdate(opt))
|
|
logFiltered, logStopped := logChecker.Check(5 * time.Second)
|
|
assert.True(t, logStopped)
|
|
assert.True(t, logFiltered[0])
|
|
})
|
|
|
|
for _, testCase := range []struct {
|
|
name string
|
|
maxPR int64
|
|
expected bool
|
|
}{
|
|
{
|
|
name: "TestPullRequest process PR",
|
|
maxPR: pull.Index,
|
|
expected: true,
|
|
},
|
|
{
|
|
name: "TestPullRequest skip PR",
|
|
maxPR: pull.Index - 1,
|
|
expected: false,
|
|
},
|
|
} {
|
|
t.Run(testCase.name, func(t *testing.T) {
|
|
logChecker, cleanup := test.NewLogChecker(log.DEFAULT, log.TRACE)
|
|
logChecker.Filter("Updating PR").StopMark("TestPullRequest ")
|
|
defer cleanup()
|
|
|
|
pull_service.TestPullRequest(context.Background(), owner, repo.ID, testCase.maxPR, "branch2", true, pull.HeadCommitID, pull.HeadCommitID)
|
|
logFiltered, logStopped := logChecker.Check(5 * time.Second)
|
|
assert.True(t, logStopped)
|
|
assert.Equal(t, testCase.expected, logFiltered[0])
|
|
})
|
|
}
|
|
}
|