lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix lint (#9688)

release/v1.15
Lunny Xiao 2020-01-10 13:50:23 +08:00 committed by GitHub
parent 17b844a3ec
commit 8878cfa4a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull_test.go
View File

@ -182,7 +182,7 @@ func TestPullRequest_UpdateCols(t *testing.T) {
BaseBranch: "baseBranch", BaseBranch: "baseBranch",
HeadBranch: "headBranch", HeadBranch: "headBranch",
} }
pr.UpdateCols("head_branch") assert.NoError(t, pr.UpdateCols("head_branch"))
pr = AssertExistsAndLoadBean(t, &PullRequest{ID: 1}).(*PullRequest) pr = AssertExistsAndLoadBean(t, &PullRequest{ID: 1}).(*PullRequest)
assert.Equal(t, "master", pr.BaseBranch) assert.Equal(t, "master", pr.BaseBranch)

4
services/pull/check.go
View File

@ -201,7 +201,9 @@ func TestPullRequests(ctx context.Context) {
} else if err = TestPatch(pr); err != nil { } else if err = TestPatch(pr); err != nil {
log.Error("testPatch[%d]: %v", pr.ID, err) log.Error("testPatch[%d]: %v", pr.ID, err)
pr.Status = models.PullRequestStatusError pr.Status = models.PullRequestStatusError
pr.UpdateCols("status") if err := pr.UpdateCols("status"); err != nil {
log.Error("update pr [%d] status to PullRequestStatusError failed: %v", pr.ID, err)
}
continue continue
} }
checkAndUpdateStatus(pr) checkAndUpdateStatus(pr)