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/db/bundb/rule_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'internal/db/bundb/rule_test.go') diff --git a/internal/db/bundb/rule_test.go b/internal/db/bundb/rule_test.go index deaf7c14c..a7bff0546 100644 --- a/internal/db/bundb/rule_test.go +++ b/internal/db/bundb/rule_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/db" @@ -37,7 +36,7 @@ func (suite *RuleTestSuite) TestPutRuleWithExisting() { Text: "Pee pee poo poo", } - if err := suite.state.DB.PutRule(context.Background(), r); err != nil { + if err := suite.state.DB.PutRule(suite.T().Context(), r); err != nil { suite.FailNow(err.Error()) } @@ -46,7 +45,7 @@ func (suite *RuleTestSuite) TestPutRuleWithExisting() { func (suite *RuleTestSuite) TestPutRuleNoExisting() { var ( - ctx = context.Background() + ctx = suite.T().Context() whereAny = []db.Where{{Key: "id", Value: "", Not: true}} ) @@ -74,7 +73,7 @@ func (suite *RuleTestSuite) TestPutRuleNoExisting() { func (suite *RuleTestSuite) TestGetRuleByID() { rule, err := suite.state.DB.GetRuleByID( - context.Background(), + suite.T().Context(), suite.testRules["rule1"].ID, ) if err != nil { @@ -91,7 +90,7 @@ func (suite *RuleTestSuite) TestGetRulesByID() { } rules, err := suite.state.DB.GetRulesByIDs( - context.Background(), + suite.T().Context(), ruleIDs, ) if err != nil { @@ -109,7 +108,7 @@ func (suite *RuleTestSuite) TestGetActiveRules() { } } - rules, err := suite.state.DB.GetActiveRules(context.Background()) + rules, err := suite.state.DB.GetActiveRules(suite.T().Context()) if err != nil { suite.FailNow(err.Error()) } -- cgit v1.2.3