diff options
| author | Lauris BH <lauris@nix.lv> | 2018-01-11 01:46:59 +0200 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2018-01-11 00:46:59 +0100 |
| commit | be1330ec89308f76557bd7fc708b1f16c703f429 (patch) | |
| tree | abdcd377f6be772aa38e9840b683e09f52a5d5c4 /integrations | |
| parent | d8dff304c0a6abb471051e968f6bdb69679b9a2a (diff) | |
| download | gitea-be1330ec89308f76557bd7fc708b1f16c703f429.tar.gz gitea-be1330ec89308f76557bd7fc708b1f16c703f429.zip | |
Remove hardcoded paths to fix randomly failing tests (#3347)
* Remove hardcoded paths to fix randomly failing tests
* Use correct function for merge path
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/integration_test.go | 1 | ||||
| -rw-r--r-- | integrations/mysql.ini.tmpl | 1 | ||||
| -rw-r--r-- | integrations/pgsql.ini.tmpl | 1 | ||||
| -rw-r--r-- | integrations/sqlite.ini | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/integrations/integration_test.go b/integrations/integration_test.go index f3dc98219f..664290cc9d 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 b093437cfe..08f8ddfa5d 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 40b977509d..17ecacec5f 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 b3462a19b4..7c9cd09b4b 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 |