tokarchuk/v1.17
Lunny Xiao 5 years ago committed by GitHub
parent 17b844a3ec
commit 8878cfa4a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      models/pull_test.go
  2. 4
      services/pull/check.go

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

@ -201,7 +201,9 @@ func TestPullRequests(ctx context.Context) {
} else if err = TestPatch(pr); err != nil {
log.Error("testPatch[%d]: %v", pr.ID, err)
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
}
checkAndUpdateStatus(pr)

Loading…
Cancel
Save