diff options
| author | 6543 <6543@obermui.de> | 2022-03-29 21:13:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 03:13:41 +0800 |
| commit | 3e88af898a7b8e2697f7e4c3867c34b802d0b660 (patch) | |
| tree | e8304867b9fd8d78ef0a3da7221d84fb29592c21 /integrations/pull_merge_test.go | |
| parent | 889a8c268ca6a54ff5be19e61b29b10feb4a12e8 (diff) | |
| download | gitea-3e88af898a7b8e2697f7e4c3867c34b802d0b660.tar.gz gitea-3e88af898a7b8e2697f7e4c3867c34b802d0b660.zip | |
Make git.OpenRepository accept Context (#19260)
* OpenRepositoryCtx -> OpenRepository
* OpenRepository -> openRepositoryWithDefaultContext, only for internal usage
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index 2e33d7095f..f865a3371e 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -238,7 +238,7 @@ func TestCantMergeConflict(t *testing.T) { BaseBranch: "base", }).(*models.PullRequest) - gitRepo, err := git.OpenRepository(repo_model.RepoPath(user1.Name, repo1.Name)) + 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") @@ -333,7 +333,7 @@ func TestCantMergeUnrelated(t *testing.T) { session.MakeRequest(t, req, http.StatusCreated) // Now this PR could be marked conflict - or at least a race may occur - so drop down to pure code at this point... - gitRepo, err := git.OpenRepository(path) + gitRepo, err := git.OpenRepository(git.DefaultContext, path) assert.NoError(t, err) pr := unittest.AssertExistsAndLoadBean(t, &models.PullRequest{ HeadRepoID: repo1.ID, |