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/federation/federatingdb/federatingdb_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/federation/federatingdb/federatingdb_test.go') diff --git a/internal/federation/federatingdb/federatingdb_test.go b/internal/federation/federatingdb/federatingdb_test.go index 1203cf6b8..ee898e293 100644 --- a/internal/federation/federatingdb/federatingdb_test.go +++ b/internal/federation/federatingdb/federatingdb_test.go @@ -19,6 +19,7 @@ package federatingdb_test import ( "context" + "testing" "time" "code.superseriousbusiness.org/gotosocial/internal/admin" @@ -51,7 +52,7 @@ type FederatingDBTestSuite struct { } func (suite *FederatingDBTestSuite) getFederatorMsg(timeout time.Duration) (*messages.FromFediAPI, bool) { - ctx := context.Background() + ctx := suite.T().Context() ctx, cncl := context.WithTimeout(ctx, timeout) defer cncl() return suite.state.Workers.Federator.Queue.PopCtx(ctx) @@ -91,9 +92,8 @@ func (suite *FederatingDBTestSuite) TearDownTest() { testrig.StopWorkers(&suite.state) } -func createTestContext(receivingAccount *gtsmodel.Account, requestingAccount *gtsmodel.Account) context.Context { - ctx := context.Background() - ctx = gtscontext.SetReceivingAccount(ctx, receivingAccount) +func createTestContext(t *testing.T, receivingAccount *gtsmodel.Account, requestingAccount *gtsmodel.Account) context.Context { + ctx := gtscontext.SetReceivingAccount(t.Context(), receivingAccount) ctx = gtscontext.SetRequestingAccount(ctx, requestingAccount) return ctx } -- cgit v1.2.3