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 <john.olheiser@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
		
							parent
							
								
									c6cee44134
								
							
						
					
					
						commit
						2b2373f6c2
					
				
					 4 changed files with 40 additions and 18 deletions
				
			
		|  | @ -33,12 +33,15 @@ SSH_LISTEN_HOST  = localhost | ||||||
| SSH_PORT         = 2201 | SSH_PORT         = 2201 | ||||||
| START_SSH_SERVER = true | START_SSH_SERVER = true | ||||||
| LFS_START_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 | OFFLINE_MODE     = false | ||||||
| LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w | LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w | ||||||
| APP_DATA_PATH    = integrations/gitea-integration-mssql/data | APP_DATA_PATH    = integrations/gitea-integration-mssql/data | ||||||
| BUILTIN_SSH_SERVER_USER = git | BUILTIN_SSH_SERVER_USER = git | ||||||
| 
 | 
 | ||||||
|  | [attachment] | ||||||
|  | PATH = integrations/gitea-integration-mssql/data | ||||||
|  | 
 | ||||||
| [mailer] | [mailer] | ||||||
| ENABLED = true | ENABLED = true | ||||||
| MAILER_TYPE = dummy | MAILER_TYPE = dummy | ||||||
|  | @ -56,12 +59,14 @@ NO_REPLY_ADDRESS                  = noreply.example.org | ||||||
| ENABLE_NOTIFY_MAIL                = true | ENABLE_NOTIFY_MAIL                = true | ||||||
| 
 | 
 | ||||||
| [picture] | [picture] | ||||||
| DISABLE_GRAVATAR        = false | DISABLE_GRAVATAR              = false | ||||||
| ENABLE_FEDERATED_AVATAR = 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] | [session] | ||||||
| PROVIDER = file | PROVIDER        = file | ||||||
| PROVIDER_CONFIG = data/sessions-mssql | PROVIDER_CONFIG = integrations/gitea-integration-mssql/data/sessions | ||||||
| 
 | 
 | ||||||
| [log] | [log] | ||||||
| MODE                 = test,file | MODE                 = test,file | ||||||
|  |  | ||||||
|  | @ -35,12 +35,15 @@ SSH_LISTEN_HOST  = localhost | ||||||
| SSH_PORT         = 2201 | SSH_PORT         = 2201 | ||||||
| START_SSH_SERVER = true | START_SSH_SERVER = true | ||||||
| LFS_START_SERVER = true | LFS_START_SERVER = true | ||||||
| LFS_CONTENT_PATH = data/lfs-mysql | LFS_CONTENT_PATH = integrations/gitea-integration-mysql/datalfs-mysql | ||||||
| OFFLINE_MODE     = false | OFFLINE_MODE     = false | ||||||
| LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w | LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w | ||||||
| APP_DATA_PATH    = integrations/gitea-integration-mysql/data | APP_DATA_PATH    = integrations/gitea-integration-mysql/data | ||||||
| BUILTIN_SSH_SERVER_USER = git | BUILTIN_SSH_SERVER_USER = git | ||||||
| 
 | 
 | ||||||
|  | [attachment] | ||||||
|  | PATH = integrations/gitea-integration-mysql/data | ||||||
|  | 
 | ||||||
| [mailer] | [mailer] | ||||||
| ENABLED = true | ENABLED = true | ||||||
| MAILER_TYPE = dummy | MAILER_TYPE = dummy | ||||||
|  | @ -58,12 +61,14 @@ NO_REPLY_ADDRESS                  = noreply.example.org | ||||||
| ENABLE_NOTIFY_MAIL                = true | ENABLE_NOTIFY_MAIL                = true | ||||||
| 
 | 
 | ||||||
| [picture] | [picture] | ||||||
| DISABLE_GRAVATAR        = false | DISABLE_GRAVATAR              = false | ||||||
| ENABLE_FEDERATED_AVATAR = 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] | [session] | ||||||
| PROVIDER = file | PROVIDER        = file | ||||||
| PROVIDER_CONFIG = data/sessions-mysql | PROVIDER_CONFIG = integrations/gitea-integration-mysql/data/sessions | ||||||
| 
 | 
 | ||||||
| [log] | [log] | ||||||
| MODE                 = test,file | MODE                 = test,file | ||||||
|  |  | ||||||
|  | @ -34,12 +34,15 @@ SSH_LISTEN_HOST  = localhost | ||||||
| SSH_PORT         = 2202 | SSH_PORT         = 2202 | ||||||
| START_SSH_SERVER = true | START_SSH_SERVER = true | ||||||
| LFS_START_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 | OFFLINE_MODE     = false | ||||||
| LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w | LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w | ||||||
| APP_DATA_PATH    = integrations/gitea-integration-pgsql/data | APP_DATA_PATH    = integrations/gitea-integration-pgsql/data | ||||||
| BUILTIN_SSH_SERVER_USER = git | BUILTIN_SSH_SERVER_USER = git | ||||||
| 
 | 
 | ||||||
|  | [attachment] | ||||||
|  | PATH = integrations/gitea-integration-pgsql/data | ||||||
|  | 
 | ||||||
| [mailer] | [mailer] | ||||||
| ENABLED = true | ENABLED = true | ||||||
| MAILER_TYPE = dummy | MAILER_TYPE = dummy | ||||||
|  | @ -57,12 +60,14 @@ NO_REPLY_ADDRESS                  = noreply.example.org | ||||||
| ENABLE_NOTIFY_MAIL                = true | ENABLE_NOTIFY_MAIL                = true | ||||||
| 
 | 
 | ||||||
| [picture] | [picture] | ||||||
| DISABLE_GRAVATAR        = false | DISABLE_GRAVATAR              = false | ||||||
| ENABLE_FEDERATED_AVATAR = 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] | [session] | ||||||
| PROVIDER = file | PROVIDER        = file | ||||||
| PROVIDER_CONFIG = data/sessions-pgsql | PROVIDER_CONFIG = integrations/gitea-integration-pgsql/data/sessions | ||||||
| 
 | 
 | ||||||
| [log] | [log] | ||||||
| MODE                 = test,file | MODE                 = test,file | ||||||
|  |  | ||||||
|  | @ -29,13 +29,16 @@ SSH_LISTEN_HOST  = localhost | ||||||
| SSH_PORT         = 2203 | SSH_PORT         = 2203 | ||||||
| START_SSH_SERVER = true | START_SSH_SERVER = true | ||||||
| LFS_START_SERVER = true | LFS_START_SERVER = true | ||||||
| LFS_CONTENT_PATH = data/lfs-sqlite | LFS_CONTENT_PATH = integrations/gitea-integration-sqlite/data | ||||||
| OFFLINE_MODE     = false | OFFLINE_MODE     = false | ||||||
| LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w | LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w | ||||||
| APP_DATA_PATH    = integrations/gitea-integration-sqlite/data | APP_DATA_PATH    = integrations/gitea-integration-sqlite/data | ||||||
| ENABLE_GZIP      = true | ENABLE_GZIP      = true | ||||||
| BUILTIN_SSH_SERVER_USER = git | BUILTIN_SSH_SERVER_USER = git | ||||||
| 
 | 
 | ||||||
|  | [attachment] | ||||||
|  | PATH = integrations/gitea-integration-sqlite/data | ||||||
|  | 
 | ||||||
| [mailer] | [mailer] | ||||||
| ENABLED     = true | ENABLED     = true | ||||||
| MAILER_TYPE = dummy | MAILER_TYPE = dummy | ||||||
|  | @ -52,11 +55,15 @@ DEFAULT_ALLOW_CREATE_ORGANIZATION = true | ||||||
| NO_REPLY_ADDRESS                  = noreply.example.org | NO_REPLY_ADDRESS                  = noreply.example.org | ||||||
| 
 | 
 | ||||||
| [picture] | [picture] | ||||||
| DISABLE_GRAVATAR        = false | DISABLE_GRAVATAR              = false | ||||||
| ENABLE_FEDERATED_AVATAR = 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] | [session] | ||||||
| PROVIDER = file | PROVIDER = file | ||||||
|  | PROVIDER_CONFIG = integrations/gitea-integration-sqlite/data/sessions | ||||||
| 
 | 
 | ||||||
| [log] | [log] | ||||||
| MODE                 = test,file | MODE                 = test,file | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue