git724/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove hardcoded paths to fix randomly failing tests (#3347)

Browse source 
* Remove hardcoded paths to fix randomly failing tests

* Use correct function for merge path
This commit is contained in:
Lauris BH 2018-01-11 01:46:59 +02:00 • committed by Kim "BKC" Carlbäcker
parent d8dff304c0
commit be1330ec89
8 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/pull.go
View file

@ -299,7 +299,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
}
// Clone base repo.
tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git")
tmpBasePath := path.Join(LocalCopyPath(), "merge-"+com.ToStr(time.Now().Nanosecond())+".git")
if err := os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm); err != nil {
return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err)