From 1dfa7fe0d51b75792db7b0c28ffad7d1f650834d Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Thu, 3 Nov 2022 15:03:12 +0100 Subject: [bugfix] Wrap media in read closer (#941) * use readcloser for content.Content * call media postdata function no matter what * return a readcloser from data func * tidy of logic of readertostore * fix whoopsie --- internal/media/pruneremote_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/media/pruneremote_test.go') diff --git a/internal/media/pruneremote_test.go b/internal/media/pruneremote_test.go index e71d3310b..d3a01b7be 100644 --- a/internal/media/pruneremote_test.go +++ b/internal/media/pruneremote_test.go @@ -74,13 +74,13 @@ func (suite *PruneRemoteTestSuite) TestPruneAndRecache() { suite.ErrorIs(err, storage.ErrNotFound) // now recache the image.... - data := func(_ context.Context) (io.Reader, int64, error) { + data := func(_ context.Context) (io.ReadCloser, int64, error) { // load bytes from a test image b, err := os.ReadFile("../../testrig/media/thoughtsofdog-original.jpeg") if err != nil { panic(err) } - return bytes.NewBuffer(b), int64(len(b)), nil + return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil } processingRecache, err := suite.manager.RecacheMedia(ctx, data, nil, testAttachment.ID) suite.NoError(err) -- cgit v1.2.3