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/followrequests/get_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'internal/api/client/followrequests/get_test.go') diff --git a/internal/api/client/followrequests/get_test.go b/internal/api/client/followrequests/get_test.go index ad0fc839d..2589aba36 100644 --- a/internal/api/client/followrequests/get_test.go +++ b/internal/api/client/followrequests/get_test.go @@ -19,7 +19,6 @@ package followrequests_test import ( "bytes" - "context" "encoding/json" "fmt" "io" @@ -59,7 +58,7 @@ func (suite *GetTestSuite) TestGet() { TargetAccountID: targetAccount.ID, } - err := suite.db.Put(context.Background(), fr) + err := suite.db.Put(suite.T().Context(), fr) suite.NoError(err) recorder := httptest.NewRecorder() @@ -134,7 +133,7 @@ func (suite *GetTestSuite) TestGetPageOldestToNewestLimit6() { } func (suite *GetTestSuite) testGetPage(limit int, direction string) { - ctx := context.Background() + ctx := suite.T().Context() // The authed local account we are going to use for HTTP requests requestingAccount := suite.testAccounts["local_account_1"] @@ -312,19 +311,19 @@ func (suite *GetTestSuite) testGetPage(limit int, direction string) { func (suite *GetTestSuite) clearAccountRelations(id string) { // Esnure no account blocks exist between accounts. _ = suite.db.DeleteAccountBlocks( - context.Background(), + suite.T().Context(), id, ) // Ensure no account follows exist between accounts. _ = suite.db.DeleteAccountFollows( - context.Background(), + suite.T().Context(), id, ) // Ensure no account follow_requests exist between accounts. _ = suite.db.DeleteAccountFollowRequests( - context.Background(), + suite.T().Context(), id, ) } -- cgit v1.2.3