Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jun 3, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aa8fea
Don't put integration test data outside of test folder
mrsdizzie Jun 3, 2020
0e2121e
Merge branch 'master' into integration-tests
jolheiser Jun 3, 2020
c4ac7c3
Merge branch 'master' into integration-tests
techknowlogick Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions integrations/mssql.ini.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
LFS_CONTENT_PATH = integrations/gitea-integration-mssql/data/lfs-mssql
LFS_CONTENT_PATH = {{REPO_TEST_DIR}}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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
PATH = integrations/gitea-integration-mssql/data
PATH = {{REPO_TEST_DIR}}integrations/gitea-integration-mssql/data


[mailer]
ENABLED = true
MAILER_TYPE = dummy
Expand All @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AVATAR_UPLOAD_PATH = integrations/gitea-integration-mssql/data/avatars
AVATAR_UPLOAD_PATH = {{REPO_TEST_DIR}}integrations/gitea-integration-mssql/data/avatars

REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-mssql/data/repo-avatars
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-mssql/data/repo-avatars
REPOSITORY_AVATAR_UPLOAD_PATH = {{REPO_TEST_DIR}}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
guillep2k marked this conversation as resolved.
Show resolved Hide resolved

[log]
MODE = test,file
Expand Down
15 changes: 10 additions & 5 deletions integrations/mysql.ini.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
15 changes: 10 additions & 5 deletions integrations/pgsql.ini.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
13 changes: 10 additions & 3 deletions integrations/sqlite.ini.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down