diff options
| author | Giteabot <teabot@gitea.io> | 2023-06-14 02:36:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 08:36:52 +0200 |
| commit | 21cd5c2f3d5c3914096f1ecfb2d2f1d13165caa4 (patch) | |
| tree | 387e8150a764ef690cbb58a0f23e026b8e985b3b /tests/test_utils.go | |
| parent | 22948048b2637495ace3091c0e0a9c6a0d96ec30 (diff) | |
| download | gitea-21cd5c2f3d5c3914096f1ecfb2d2f1d13165caa4.tar.gz gitea-21cd5c2f3d5c3914096f1ecfb2d2f1d13165caa4.zip | |
Fix all possible setting error related storages and added some tests (#23911) (#25244)
Backport #23911 by @lunny
Follow up #22405
Fix #20703
This PR rewrites storage configuration read sequences with some breaks
and tests. It becomes more strict than before and also fixed some
inherit problems.
- Move storage's MinioConfig struct into setting, so after the
configuration loading, the values will be stored into the struct but not
still on some section.
- All storages configurations should be stored on one section,
configuration items cannot be overrided by multiple sections. The
prioioty of configuration is `[attachment]` > `[storage.attachments]` |
`[storage.customized]` > `[storage]` > `default`
- For extra override configuration items, currently are `SERVE_DIRECT`,
`MINIO_BASE_PATH`, `MINIO_BUCKET`, which could be configured in another
section. The prioioty of the override configuration is `[attachment]` >
`[storage.attachments]` > `default`.
- Add more tests for storages configurations.
- Update the storage documentations.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'tests/test_utils.go')
| -rw-r--r-- | tests/test_utils.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test_utils.go b/tests/test_utils.go index 6f0fb25560..5540d92e92 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -214,7 +214,9 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() { // load LFS object fixtures // (LFS storage can be on any of several backends, including remote servers, so we init it with the storage API) - lfsFixtures, err := storage.NewStorage("", storage.LocalStorageConfig{Path: path.Join(filepath.Dir(setting.AppPath), "tests/gitea-lfs-meta")}) + lfsFixtures, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{ + Path: filepath.Join(filepath.Dir(setting.AppPath), "tests/gitea-lfs-meta"), + }) assert.NoError(t, err) assert.NoError(t, storage.Clean(storage.LFS)) assert.NoError(t, lfsFixtures.IterateObjects("", func(path string, _ storage.Object) error { |