Don't put integration test data outside of test folder (#11746)

Some integration test data is being put outside of the integration test folders which means it isn't deleted properly with make clean. Update config so it works as expected. Co-authored-by: John Olheiser <[email protected]> Co-authored-by: techknowlogick <[email protected]>
go-gitea · Jun 3, 2020 · 2b2373f · 2b2373f
1 parent c6cee44
commit 2b2373f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 18 deletions.
diff --git a/integrations/mssql.ini.tmpl b/integrations/mssql.ini.tmpl
@@ -33,12 +33,15 @@ SSH_LISTEN_HOST  = localhost
 SSH_PORT         = 2201
 START_SSH_SERVER = true
 LFS_START_SERVER = true
-LFS_CONTENT_PATH = data/lfs-mssql
+LFS_CONTENT_PATH = integrations/gitea-integration-mssql/data/lfs-mssql
 OFFLINE_MODE     = false
 LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
 APP_DATA_PATH    = integrations/gitea-integration-mssql/data
 BUILTIN_SSH_SERVER_USER = git
 
+[attachment]
+PATH = integrations/gitea-integration-mssql/data
+
 [mailer]
 ENABLED = true
 MAILER_TYPE = dummy
@@ -56,12 +59,14 @@ NO_REPLY_ADDRESS                  = noreply.example.org
 ENABLE_NOTIFY_MAIL                = true
 
 [picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
+DISABLE_GRAVATAR              = false
+ENABLE_FEDERATED_AVATAR       = false
+AVATAR_UPLOAD_PATH            = integrations/gitea-integration-mssql/data/avatars
+REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-mssql/data/repo-avatars
 
 [session]
-PROVIDER = file
-PROVIDER_CONFIG = data/sessions-mssql
+PROVIDER        = file
+PROVIDER_CONFIG = integrations/gitea-integration-mssql/data/sessions
 
 [log]
 MODE                 = test,file

diff --git a/integrations/mysql.ini.tmpl b/integrations/mysql.ini.tmpl
@@ -35,12 +35,15 @@ SSH_LISTEN_HOST  = localhost
 SSH_PORT         = 2201
 START_SSH_SERVER = true
 LFS_START_SERVER = true
-LFS_CONTENT_PATH = data/lfs-mysql
+LFS_CONTENT_PATH = integrations/gitea-integration-mysql/datalfs-mysql
 OFFLINE_MODE     = false
 LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
 APP_DATA_PATH    = integrations/gitea-integration-mysql/data
 BUILTIN_SSH_SERVER_USER = git
 
+[attachment]
+PATH = integrations/gitea-integration-mysql/data
+
 [mailer]
 ENABLED = true
 MAILER_TYPE = dummy
@@ -58,12 +61,14 @@ NO_REPLY_ADDRESS                  = noreply.example.org
 ENABLE_NOTIFY_MAIL                = true
 
 [picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
+DISABLE_GRAVATAR              = false
+ENABLE_FEDERATED_AVATAR       = false
+AVATAR_UPLOAD_PATH            = integrations/gitea-integration-mysql/data/avatars
+REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-mysql/data/repo-avatars
 
 [session]
-PROVIDER = file
-PROVIDER_CONFIG = data/sessions-mysql
+PROVIDER        = file
+PROVIDER_CONFIG = integrations/gitea-integration-mysql/data/sessions
 
 [log]
 MODE                 = test,file

diff --git a/integrations/pgsql.ini.tmpl b/integrations/pgsql.ini.tmpl
@@ -34,12 +34,15 @@ SSH_LISTEN_HOST  = localhost
 SSH_PORT         = 2202
 START_SSH_SERVER = true
 LFS_START_SERVER = true
-LFS_CONTENT_PATH = data/lfs-pgsql
+LFS_CONTENT_PATH = integrations/gitea-integration-pgsql/data/lfs-pgsql
 OFFLINE_MODE     = false
 LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
 APP_DATA_PATH    = integrations/gitea-integration-pgsql/data
 BUILTIN_SSH_SERVER_USER = git
 
+[attachment]
+PATH = integrations/gitea-integration-pgsql/data
+
 [mailer]
 ENABLED = true
 MAILER_TYPE = dummy
@@ -57,12 +60,14 @@ NO_REPLY_ADDRESS                  = noreply.example.org
 ENABLE_NOTIFY_MAIL                = true
 
 [picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
+DISABLE_GRAVATAR              = false
+ENABLE_FEDERATED_AVATAR       = false
+AVATAR_UPLOAD_PATH            = integrations/gitea-integration-pgsql/data/avatars
+REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-pgsql/data/repo-avatars
 
 [session]
-PROVIDER = file
-PROVIDER_CONFIG = data/sessions-pgsql
+PROVIDER        = file
+PROVIDER_CONFIG = integrations/gitea-integration-pgsql/data/sessions
 
 [log]
 MODE                 = test,file

diff --git a/integrations/sqlite.ini.tmpl b/integrations/sqlite.ini.tmpl
@@ -29,13 +29,16 @@ SSH_LISTEN_HOST  = localhost
 SSH_PORT         = 2203
 START_SSH_SERVER = true
 LFS_START_SERVER = true
-LFS_CONTENT_PATH = data/lfs-sqlite
+LFS_CONTENT_PATH = integrations/gitea-integration-sqlite/data
 OFFLINE_MODE     = false
 LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
 APP_DATA_PATH    = integrations/gitea-integration-sqlite/data
 ENABLE_GZIP      = true
 BUILTIN_SSH_SERVER_USER = git
 
+[attachment]
+PATH = integrations/gitea-integration-sqlite/data
+
 [mailer]
 ENABLED     = true
 MAILER_TYPE = dummy
@@ -52,11 +55,15 @@ DEFAULT_ALLOW_CREATE_ORGANIZATION = true
 NO_REPLY_ADDRESS                  = noreply.example.org
 
 [picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
+DISABLE_GRAVATAR              = false
+ENABLE_FEDERATED_AVATAR       = false
+AVATAR_UPLOAD_PATH            = integrations/gitea-integration-sqlite/data/avatars
+REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-sqlite/data/repo-avatars
+
 
 [session]
 PROVIDER = file
+PROVIDER_CONFIG = integrations/gitea-integration-sqlite/data/sessions
 
 [log]
 MODE                 = test,file