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.

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

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

Merged
merged 3 commits into from
Jun 3, 2020

Conversation

mrsdizzie
Copy link
Member

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.

Found 48GB of LFS test data and 17GB of attachments uncleaned in my data folder 😑

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.
@techknowlogick techknowlogick added this to the 1.13.0 milestone Jun 3, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jun 3, 2020
Copy link
Member

@guillep2k guillep2k left a comment

Choose a reason for hiding this comment

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

Please use the {{REPO_TEST_DIR}} prefix in all .tmpl files.

@@ -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

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

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
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

integrations/mssql.ini.tmpl Show resolved Hide resolved
@mrsdizzie
Copy link
Member Author

@guillep2k none of the indexers, db, or anything else outside of repos themselves currently use this I don't see why this would be different. I think these should stay until somebody has run make clean same as those

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 3, 2020
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

Test PASS local too

@techknowlogick
Copy link
Member

ping LG-TM

@techknowlogick techknowlogick merged commit 2b2373f into go-gitea:master Jun 3, 2020
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
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>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants