From 13e4bbdbfa104a2384834b634285dce2f4dafe2e Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Tue, 14 Jun 2022 18:00:57 +0200 Subject: [chore] Duplicated media cleanup (#649) * add migration to clean up duplicated media * use /tmp/gotosocial for testrig storage path * defer remove storage tempdir * skip if not attached to status or status not found * log errors at error level * only log delete as else clause if successful * just return nil on down * reword delete logic a little bit * check if storage base path is defined * check for status id more thoroughly * don't log error if just no rows * go fmt * break statusIDLoop when found * break currentlyUsedLoop when found --- testrig/config.go | 5 ++++- testrig/storage.go | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'testrig') diff --git a/testrig/config.go b/testrig/config.go index e424670fa..92d04c453 100644 --- a/testrig/config.go +++ b/testrig/config.go @@ -19,6 +19,9 @@ package testrig import ( + "os" + "path" + "github.com/coreos/go-oidc/v3/oidc" "github.com/superseriousbusiness/gotosocial/internal/config" ) @@ -64,7 +67,7 @@ var TestDefaults = config.Configuration{ MediaRemoteCacheDays: 30, StorageBackend: "local", - StorageLocalBasePath: "/gotosocial/storage", + StorageLocalBasePath: path.Join(os.TempDir(), "gotosocial"), StatusesMaxChars: 5000, StatusesCWMaxChars: 100, diff --git a/testrig/storage.go b/testrig/storage.go index 0e91d7dbe..666256593 100644 --- a/testrig/storage.go +++ b/testrig/storage.go @@ -21,6 +21,7 @@ package testrig import ( "fmt" "os" + "path" "codeberg.org/gruf/go-store/kv" "codeberg.org/gruf/go-store/storage" @@ -94,6 +95,8 @@ func StandardStorageSetup(s *kv.KVStore, relativePath string) { // StandardStorageTeardown deletes everything in storage so that it's clean for the next test func StandardStorageTeardown(s *kv.KVStore) { + defer os.RemoveAll(path.Join(os.TempDir(), "gotosocial")) + iter, err := s.Iterator(nil) if err != nil { panic(err) -- cgit v1.3