From ce978ba24702cdf8e8251f2f58cf5a8d6726e4c0 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 7 Aug 2023 22:02:47 +0200 Subject: [PATCH 1/2] add tests cases for attachments, lfs & actions_artifacts --- modules/setting/storage_test.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/setting/storage_test.go b/modules/setting/storage_test.go index 9a83f31d918b4..8a20e82135079 100644 --- a/modules/setting/storage_test.go +++ b/modules/setting/storage_test.go @@ -117,6 +117,9 @@ func Test_getStorageInheritStorageTypeLocal(t *testing.T) { [storage] STORAGE_TYPE = local `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/appdata/attachments"}, + {loadLFSFrom, &LFS.Storage, "/appdata/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/appdata/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/appdata/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/appdata/repo-archive"}, {loadActionsFrom, &Actions.LogStorage, "/appdata/actions_log"}, @@ -131,6 +134,9 @@ func Test_getStorageInheritStorageTypeLocalPath(t *testing.T) { STORAGE_TYPE = local PATH = /data/gitea `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/data/gitea/attachments"}, + {loadLFSFrom, &LFS.Storage, "/data/gitea/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/data/gitea/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/data/gitea/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/data/gitea/repo-archive"}, {loadActionsFrom, &Actions.LogStorage, "/data/gitea/actions_log"}, @@ -145,6 +151,9 @@ func Test_getStorageInheritStorageTypeLocalRelativePath(t *testing.T) { STORAGE_TYPE = local PATH = storages `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/appdata/storages/attachments"}, + {loadLFSFrom, &LFS.Storage, "/appdata/storages/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/appdata/storages/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/appdata/storages/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/appdata/storages/repo-archive"}, {loadActionsFrom, &Actions.LogStorage, "/appdata/storages/actions_log"}, @@ -162,6 +171,9 @@ PATH = /data/gitea [repo-archive] PATH = /data/gitea/the-archives-dir `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/data/gitea/attachments"}, + {loadLFSFrom, &LFS.Storage, "/data/gitea/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/data/gitea/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/data/gitea/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/data/gitea/the-archives-dir"}, {loadActionsFrom, &Actions.LogStorage, "/data/gitea/actions_log"}, @@ -178,6 +190,9 @@ PATH = /data/gitea [repo-archive] `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/data/gitea/attachments"}, + {loadLFSFrom, &LFS.Storage, "/data/gitea/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/data/gitea/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/data/gitea/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/data/gitea/repo-archive"}, {loadActionsFrom, &Actions.LogStorage, "/data/gitea/actions_log"}, @@ -195,6 +210,9 @@ PATH = /data/gitea [repo-archive] PATH = the-archives-dir `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/data/gitea/attachments"}, + {loadLFSFrom, &LFS.Storage, "/data/gitea/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/data/gitea/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/data/gitea/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/data/gitea/the-archives-dir"}, {loadActionsFrom, &Actions.LogStorage, "/data/gitea/actions_log"}, @@ -209,6 +227,9 @@ func Test_getStorageInheritStorageTypeLocalPathOverride3(t *testing.T) { STORAGE_TYPE = local PATH = /data/gitea/archives `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/appdata/attachments"}, + {loadLFSFrom, &LFS.Storage, "/appdata/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/appdata/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/appdata/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/data/gitea/archives"}, {loadActionsFrom, &Actions.LogStorage, "/appdata/actions_log"}, @@ -226,6 +247,9 @@ PATH = /data/gitea/archives [repo-archive] PATH = /tmp/gitea/archives `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/appdata/attachments"}, + {loadLFSFrom, &LFS.Storage, "/appdata/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/appdata/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/appdata/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/tmp/gitea/archives"}, {loadActionsFrom, &Actions.LogStorage, "/appdata/actions_log"}, @@ -242,6 +266,9 @@ PATH = /data/gitea/archives [repo-archive] `, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/appdata/attachments"}, + {loadLFSFrom, &LFS.Storage, "/appdata/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/appdata/actions_artifacts"}, {loadPackagesFrom, &Packages.Storage, "/appdata/packages"}, {loadRepoArchiveFrom, &RepoArchive.Storage, "/data/gitea/archives"}, {loadActionsFrom, &Actions.LogStorage, "/appdata/actions_log"}, From 2d88fcff295301e5f1bccf0e1807ea982529b988 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 7 Aug 2023 22:10:47 +0200 Subject: [PATCH 2/2] test relative paths in [storage.xxx].PATH --- modules/setting/storage_test.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/setting/storage_test.go b/modules/setting/storage_test.go index 8a20e82135079..bee133e99f4e7 100644 --- a/modules/setting/storage_test.go +++ b/modules/setting/storage_test.go @@ -238,6 +238,23 @@ PATH = /data/gitea/archives }) } +func Test_getStorageInheritStorageTypeLocalPathOverride3_5(t *testing.T) { + testLocalStoragePath(t, "/appdata", ` +[storage.repo-archive] +STORAGE_TYPE = local +PATH = a-relative-path +`, []testLocalStoragePathCase{ + {loadAttachmentFrom, &Attachment.Storage, "/appdata/attachments"}, + {loadLFSFrom, &LFS.Storage, "/appdata/lfs"}, + {loadActionsFrom, &Actions.ArtifactStorage, "/appdata/actions_artifacts"}, + {loadPackagesFrom, &Packages.Storage, "/appdata/packages"}, + {loadRepoArchiveFrom, &RepoArchive.Storage, "/appdata/a-relative-path"}, + {loadActionsFrom, &Actions.LogStorage, "/appdata/actions_log"}, + {loadAvatarsFrom, &Avatar.Storage, "/appdata/avatars"}, + {loadRepoAvatarFrom, &RepoAvatar.Storage, "/appdata/repo-avatars"}, + }) +} + func Test_getStorageInheritStorageTypeLocalPathOverride4(t *testing.T) { testLocalStoragePath(t, "/appdata", ` [storage.repo-archive]