NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-20 20:07:03 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

tests: Use require.NoError in tests picked from Gitea

Browse source 
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
This commit is contained in:
Gergely Nagy 2024-08-25 12:40:26 +02:00
parent ef5ac9a8ee
commit 0aa3e6e4e4
No known key found for this signature in database
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/integration/pull_merge_test.go
View file

@ -1034,10 +1034,10 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
t.Run("Clone", doGitClone(dstPath, u)) t.Run("Clone", doGitClone(dstPath, u))
err := os.WriteFile(path.Join(dstPath, "test_file"), []byte("## test content"), 0o666) err := os.WriteFile(path.Join(dstPath, "test_file"), []byte("## test content"), 0o666)
assert.NoError(t, err) require.NoError(t, err)
err = git.AddChanges(dstPath, true) err = git.AddChanges(dstPath, true)
assert.NoError(t, err) require.NoError(t, err)
err = git.CommitChanges(dstPath, git.CommitChangesOptions{ err = git.CommitChanges(dstPath, git.CommitChangesOptions{
Committer: &git.Signature{ Committer: &git.Signature{
@ -1052,7 +1052,7 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
}, },
Message: "Testing commit 1", Message: "Testing commit 1",
}) })
assert.NoError(t, err) require.NoError(t, err)
stderrBuf := &bytes.Buffer{} stderrBuf := &bytes.Buffer{}
@ -1063,7 +1063,7 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
AddArguments("-o"). AddArguments("-o").
AddDynamicArguments(`description="This PR is a test pull request which created with agit"`). AddDynamicArguments(`description="This PR is a test pull request which created with agit"`).
Run(&git.RunOpts{Dir: dstPath, Stderr: stderrBuf}) Run(&git.RunOpts{Dir: dstPath, Stderr: stderrBuf})
assert.NoError(t, err) require.NoError(t, err)
assert.Contains(t, stderrBuf.String(), setting.AppURL+"user2/repo1/pulls/6") assert.Contains(t, stderrBuf.String(), setting.AppURL+"user2/repo1/pulls/6")
@ -1093,12 +1093,12 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
// first time insert automerge record, return true // first time insert automerge record, return true
scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test")
assert.NoError(t, err) require.NoError(t, err)
assert.True(t, scheduled) assert.True(t, scheduled)
// second time insert automerge record, return false because it does exist // second time insert automerge record, return false because it does exist
scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test")
assert.Error(t, err) require.Error(t, err)
assert.False(t, scheduled) assert.False(t, scheduled)
// reload pr again // reload pr again
@ -1108,11 +1108,11 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
// update commit status to success, then it should be merged automatically // update commit status to success, then it should be merged automatically
baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo) baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo)
assert.NoError(t, err) require.NoError(t, err)
sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
assert.NoError(t, err) require.NoError(t, err)
masterCommitID, err := baseGitRepo.GetBranchCommitID("master") masterCommitID, err := baseGitRepo.GetBranchCommitID("master")
assert.NoError(t, err) require.NoError(t, err)
baseGitRepo.Close() baseGitRepo.Close()
defer func() { defer func() {
testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID) testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID)
@ -1123,7 +1123,7 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
TargetURL: "https://gitea.com", TargetURL: "https://gitea.com",
Context: "gitea/actions", Context: "gitea/actions",
}) })
assert.NoError(t, err) require.NoError(t, err)
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)