diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-01-07 03:23:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 19:23:57 +0000 |
| commit | 3c96a3716288b0ae1ae65df44cc92218b489b77f (patch) | |
| tree | 014f698c969dfaad3602681e07140f75263889a9 /integrations | |
| parent | 8688c2be95f1d11fadd6cbb979eafe0bb817589a (diff) | |
| download | gitea-3c96a3716288b0ae1ae65df44cc92218b489b77f.tar.gz gitea-3c96a3716288b0ae1ae65df44cc92218b489b77f.zip | |
Some code improvements (#14266)
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/pull_merge_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index b5edb41eec..79f62c32c1 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -246,6 +246,7 @@ func TestCantMergeConflict(t *testing.T) { err = pull.Merge(pr, user1, gitRepo, models.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() }) } @@ -329,5 +330,6 @@ func TestCantMergeUnrelated(t *testing.T) { err = pull.Merge(pr, user1, gitRepo, models.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() }) } |