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/conversation_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'internal/db/bundb/conversation_test.go') diff --git a/internal/db/bundb/conversation_test.go b/internal/db/bundb/conversation_test.go index 15cdf8b3c..61ef12c89 100644 --- a/internal/db/bundb/conversation_test.go +++ b/internal/db/bundb/conversation_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "time" @@ -57,7 +56,7 @@ func (suite *ConversationTestSuite) SetupTest() { // deleteStatus deletes a status from conversations and ends the test if that fails. func (suite *ConversationTestSuite) deleteStatus(statusID string) { - err := suite.db.DeleteStatusFromConversations(context.Background(), statusID) + err := suite.db.DeleteStatusFromConversations(suite.T().Context(), statusID) if err != nil { suite.FailNow(err.Error()) } @@ -65,7 +64,7 @@ func (suite *ConversationTestSuite) deleteStatus(statusID string) { // getConversation fetches a conversation by ID and ends the test if that fails. func (suite *ConversationTestSuite) getConversation(conversationID string) *gtsmodel.Conversation { - conversation, err := suite.db.GetConversationByID(context.Background(), conversationID) + conversation, err := suite.db.GetConversationByID(suite.T().Context(), conversationID) if err != nil { suite.FailNow(err.Error()) } @@ -106,7 +105,7 @@ func (suite *ConversationTestSuite) TestDeleteOnlyStatus() { initial := conversation.LastStatus suite.deleteStatus(initial.ID) - _, err := suite.db.GetConversationByID(context.Background(), conversation.ID) + _, err := suite.db.GetConversationByID(suite.T().Context(), conversation.ID) suite.ErrorIs(err, db.ErrNoEntries) } -- cgit v1.2.3