diff options
| author | zeripath <art27@cantab.net> | 2019-12-13 22:21:06 +0000 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2019-12-13 23:21:06 +0100 |
| commit | 74179d1b5e739b3fa0d0915bb35d6b7596fd13af (patch) | |
| tree | fd8eb776c254b716a4e2d416bb6903f1c4c90ea7 /modules/git/repo_compare_test.go | |
| parent | 8f16a2c37b4f2650f5e9623a92eb368db9564c6f (diff) | |
| download | gitea-74179d1b5e739b3fa0d0915bb35d6b7596fd13af.tar.gz gitea-74179d1b5e739b3fa0d0915bb35d6b7596fd13af.zip | |
Remove SavePatch and generate patches on the fly (#9302)
* Save patches to temporary files
* Remove SavePatch and generate patches on the fly
* Use ioutil.TempDir
* fixup! Use ioutil.TempDir
* fixup! fixup! Use ioutil.TempDir
* RemoveAll LocalCopyPath() in initIntergrationTest
* Default to status checking on PR creation
* Remove unnecessary set to StatusChecking
* Protect against unable to load repo
* Handle conflicts
* Restore original conflict setting
* In TestPullRequests update status to StatusChecking before running TestPatch
Diffstat (limited to 'modules/git/repo_compare_test.go')
| -rw-r--r-- | modules/git/repo_compare_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/git/repo_compare_test.go b/modules/git/repo_compare_test.go index def67fa87b..bf4631d853 100644 --- a/modules/git/repo_compare_test.go +++ b/modules/git/repo_compare_test.go @@ -5,6 +5,7 @@ package git import ( + "bytes" "io/ioutil" "os" "path/filepath" @@ -21,7 +22,8 @@ func TestGetFormatPatch(t *testing.T) { repo, err := OpenRepository(clonedPath) assert.NoError(t, err) defer repo.Close() - rd, err := repo.GetFormatPatch("8d92fc95^", "8d92fc95") + rd := &bytes.Buffer{} + err = repo.GetPatch("8d92fc95^", "8d92fc95", rd) assert.NoError(t, err) patchb, err := ioutil.ReadAll(rd) assert.NoError(t, err) |