From be1330ec89308f76557bd7fc708b1f16c703f429 Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Thu, 11 Jan 2018 01:46:59 +0200
Subject: [PATCH] Remove hardcoded paths to fix randomly failing tests (#3347)
* Remove hardcoded paths to fix randomly failing tests
* Use correct function for merge path
---
integrations/integration_test.go | 1 +
integrations/mysql.ini.tmpl | 1 +
integrations/pgsql.ini.tmpl | 1 +
integrations/sqlite.ini | 2 ++
models/pull.go | 2 +-
models/wiki.go | 10 +++++++++-
models/wiki_test.go | 2 +-
modules/setting/setting.go | 3 +++
8 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/integrations/integration_test.go b/integrations/integration_test.go
index f3dc98219fe..664290cc9da 100644
--- a/integrations/integration_test.go
+++ b/integrations/integration_test.go
@@ -138,6 +138,7 @@ func prepareTestEnv(t testing.TB) {
assert.NoError(t, models.LoadFixtures())
assert.NoError(t, os.RemoveAll(setting.RepoRootPath))
assert.NoError(t, os.RemoveAll(models.LocalCopyPath()))
+ assert.NoError(t, os.RemoveAll(models.LocalWikiPath()))
assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"),
setting.RepoRootPath))
diff --git a/integrations/mysql.ini.tmpl b/integrations/mysql.ini.tmpl
index b093437cfee..08f8ddfa5d7 100644
--- a/integrations/mysql.ini.tmpl
+++ b/integrations/mysql.ini.tmpl
@@ -20,6 +20,7 @@ ROOT = integrations/gitea-integration-mysql/gitea-repositories
[repository.local]
LOCAL_COPY_PATH = tmp/local-repo-mysql
+LOCAL_WIKI_PATH = tmp/local-wiki-mysql
[server]
SSH_DOMAIN = localhost
diff --git a/integrations/pgsql.ini.tmpl b/integrations/pgsql.ini.tmpl
index 40b977509d6..17ecacec5f2 100644
--- a/integrations/pgsql.ini.tmpl
+++ b/integrations/pgsql.ini.tmpl
@@ -20,6 +20,7 @@ ROOT = integrations/gitea-integration-pgsql/gitea-repositories
[repository.local]
LOCAL_COPY_PATH = tmp/local-repo-pgsql
+LOCAL_WIKI_PATH = tmp/local-wiki-pgsql
[server]
SSH_DOMAIN = localhost
diff --git a/integrations/sqlite.ini b/integrations/sqlite.ini
index b3462a19b43..7c9cd09b4b3 100644
--- a/integrations/sqlite.ini
+++ b/integrations/sqlite.ini
@@ -15,6 +15,7 @@ ROOT = integrations/gitea-integration-sqlite/gitea-repositories
[repository.local]
LOCAL_COPY_PATH = tmp/local-repo-sqlite
+LOCAL_WIKI_PATH = tmp/local-wiki-sqlite
[server]
SSH_DOMAIN = localhost
@@ -23,6 +24,7 @@ ROOT_URL = http://localhost:3003/
DISABLE_SSH = false
SSH_PORT = 22
LFS_START_SERVER = true
+LFS_CONTENT_PATH = data/lfs-sqlite
OFFLINE_MODE = false
LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
diff --git a/models/pull.go b/models/pull.go
index c9357e91301..38312e4e400 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -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)
diff --git a/models/wiki.go b/models/wiki.go
index 3819eb95f01..3a39daf0f64 100644
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -90,9 +90,17 @@ func (repo *Repository) InitWiki() error {
return nil
}
+// LocalWikiPath returns the local wiki repository copy path.
+func LocalWikiPath() string {
+ if filepath.IsAbs(setting.Repository.Local.LocalWikiPath) {
+ return setting.Repository.Local.LocalWikiPath
+ }
+ return path.Join(setting.AppDataPath, setting.Repository.Local.LocalWikiPath)
+}
+
// LocalWikiPath returns the path to the local wiki repository (?).
func (repo *Repository) LocalWikiPath() string {
- return path.Join(setting.AppDataPath, "tmp/local-wiki", com.ToStr(repo.ID))
+ return path.Join(LocalWikiPath(), com.ToStr(repo.ID))
}
// UpdateLocalWiki makes sure the local copy of repository wiki is up-to-date.
diff --git a/models/wiki_test.go b/models/wiki_test.go
index c816a175588..80f6df55ecd 100644
--- a/models/wiki_test.go
+++ b/models/wiki_test.go
@@ -145,7 +145,7 @@ func TestRepository_InitWiki(t *testing.T) {
func TestRepository_LocalWikiPath(t *testing.T) {
PrepareTestEnv(t)
repo := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository)
- expected := filepath.Join(setting.AppDataPath, "tmp/local-wiki/1")
+ expected := filepath.Join(setting.AppDataPath, setting.Repository.Local.LocalWikiPath, "1")
assert.Equal(t, expected, repo.LocalWikiPath())
}
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 1a9262c42fb..338637836d0 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -215,6 +215,7 @@ var (
// Repository local settings
Local struct {
LocalCopyPath string
+ LocalWikiPath string
} `ini:"-"`
}{
AnsiCharset: "",
@@ -254,8 +255,10 @@ var (
// Repository local settings
Local: struct {
LocalCopyPath string
+ LocalWikiPath string
}{
LocalCopyPath: "tmp/local-repo",
+ LocalWikiPath: "tmp/local-wiki",
},
}
RepoRootPath string