diff options
| author | 6543 <6543@obermui.de> | 2022-05-03 21:46:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 21:46:28 +0200 |
| commit | 92f139d091c906cc6d30599101d45c62a208f585 (patch) | |
| tree | e7be0dfc3cd9ae0611bd7cfa11cc1ee277e756fd /integrations | |
| parent | 730420b6b32414db7fcd12ede87712b0f960de7b (diff) | |
| download | gitea-92f139d091c906cc6d30599101d45c62a208f585.tar.gz gitea-92f139d091c906cc6d30599101d45c62a208f585.zip | |
Use for a repo action one database transaction (#19576)
... more context
(part of #9307)
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/pull_merge_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index f8e8c79a88..476f7ab52f 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -243,11 +243,11 @@ func TestCantMergeConflict(t *testing.T) { gitRepo, err := git.OpenRepository(git.DefaultContext, repo_model.RepoPath(user1.Name, repo1.Name)) assert.NoError(t, err) - err = pull.Merge(git.DefaultContext, pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "CONFLICT") + err = pull.Merge(pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "CONFLICT") assert.Error(t, err, "Merge should return an error due to conflict") assert.True(t, models.IsErrMergeConflicts(err), "Merge error is not a conflict error") - err = pull.Merge(git.DefaultContext, pr, user1, gitRepo, repo_model.MergeStyleRebase, "", "CONFLICT") + err = pull.Merge(pr, user1, gitRepo, repo_model.MergeStyleRebase, "", "CONFLICT") assert.Error(t, err, "Merge should return an error due to conflict") assert.True(t, models.IsErrRebaseConflicts(err), "Merge error is not a conflict error") gitRepo.Close() @@ -342,7 +342,7 @@ func TestCantMergeUnrelated(t *testing.T) { BaseBranch: "base", }).(*models.PullRequest) - err = pull.Merge(git.DefaultContext, pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "UNRELATED") + err = pull.Merge(pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "UNRELATED") assert.Error(t, err, "Merge should return an error due to unrelated") assert.True(t, models.IsErrMergeUnrelatedHistories(err), "Merge error is not a unrelated histories error") gitRepo.Close() |