From d5c9c4adc167cdb05e73f5105702cf340293e61c Mon Sep 17 00:00:00 2001 From: Daenney Date: Thu, 22 May 2025 12:26:11 +0200 Subject: [chore] Upgrade to Go 1.24 (#4187) * Set `go.mod` to 1.24 now that it's been out for 3 months. * Update all the test to use `testing.T.Context()`. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4187 Co-authored-by: Daenney Co-committed-by: Daenney --- internal/api/client/admin/mediacleanup_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'internal/api/client/admin/mediacleanup_test.go') diff --git a/internal/api/client/admin/mediacleanup_test.go b/internal/api/client/admin/mediacleanup_test.go index 8224b875f..8efef54c4 100644 --- a/internal/api/client/admin/mediacleanup_test.go +++ b/internal/api/client/admin/mediacleanup_test.go @@ -18,7 +18,6 @@ package admin_test import ( - "context" "net/http" "net/http/httptest" "testing" @@ -49,7 +48,7 @@ func (suite *MediaCleanupTestSuite) TestMediaCleanup() { // the attachment should be updated in the database if !testrig.WaitFor(func() bool { - if prunedAttachment, _ := suite.db.GetAttachmentByID(context.Background(), testAttachment.ID); prunedAttachment != nil { + if prunedAttachment, _ := suite.db.GetAttachmentByID(suite.T().Context(), testAttachment.ID); prunedAttachment != nil { return !*prunedAttachment.Cached } return false @@ -74,7 +73,7 @@ func (suite *MediaCleanupTestSuite) TestMediaCleanupNoArg() { suite.Equal(http.StatusOK, recorder.Code) if !testrig.WaitFor(func() bool { - if prunedAttachment, _ := suite.db.GetAttachmentByID(context.Background(), testAttachment.ID); prunedAttachment != nil { + if prunedAttachment, _ := suite.db.GetAttachmentByID(suite.T().Context(), testAttachment.ID); prunedAttachment != nil { return !*prunedAttachment.Cached } return false @@ -101,7 +100,7 @@ func (suite *MediaCleanupTestSuite) TestMediaCleanupNotOldEnough() { time.Sleep(1 * time.Second) // Get media we pruned - prunedAttachment, err := suite.db.GetAttachmentByID(context.Background(), testAttachment.ID) + prunedAttachment, err := suite.db.GetAttachmentByID(suite.T().Context(), testAttachment.ID) suite.NoError(err) // the media should still be cached -- cgit v1.2.3