From ba9d6b467a1f03447789844048d913738c843569 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 10 Nov 2023 19:29:26 +0100 Subject: [feature] Media attachment placeholders (#2331) * [feature] Use placeholders for unknown media types * fix read of underreported small files * switch to reduce nesting * simplify cleanup --- internal/cleaner/media_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'internal/cleaner/media_test.go') diff --git a/internal/cleaner/media_test.go b/internal/cleaner/media_test.go index 20a643ea8..c1226bcb5 100644 --- a/internal/cleaner/media_test.go +++ b/internal/cleaner/media_test.go @@ -304,7 +304,7 @@ func (suite *MediaTestSuite) TestUncacheRemote() { after := time.Now().Add(-24 * time.Hour) totalUncached, err := suite.cleaner.Media().UncacheRemote(ctx, after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) uncachedAttachment, err := suite.db.GetAttachmentByID(ctx, testStatusAttachment.ID) suite.NoError(err) @@ -327,7 +327,7 @@ func (suite *MediaTestSuite) TestUncacheRemoteDry() { after := time.Now().Add(-24 * time.Hour) totalUncached, err := suite.cleaner.Media().UncacheRemote(gtscontext.SetDryRun(ctx), after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) uncachedAttachment, err := suite.db.GetAttachmentByID(ctx, testStatusAttachment.ID) suite.NoError(err) @@ -344,7 +344,7 @@ func (suite *MediaTestSuite) TestUncacheRemoteTwice() { totalUncached, err := suite.cleaner.Media().UncacheRemote(ctx, after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) // final uncache should uncache nothing, since the first uncache already happened totalUncachedAgain, err := suite.cleaner.Media().UncacheRemote(ctx, after) @@ -360,7 +360,7 @@ func (suite *MediaTestSuite) TestUncacheAndRecache() { after := time.Now().Add(-24 * time.Hour) totalUncached, err := suite.cleaner.Media().UncacheRemote(ctx, after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) // media should no longer be stored _, err = suite.storage.Get(ctx, testStatusAttachment.File.Path) @@ -424,5 +424,5 @@ func (suite *MediaTestSuite) TestUncacheOneNonExistent() { after := time.Now().Add(-24 * time.Hour) totalUncached, err := suite.cleaner.Media().UncacheRemote(ctx, after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) } -- cgit v1.2.3