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/instance_test.go | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'internal/db/bundb/instance_test.go') diff --git a/internal/db/bundb/instance_test.go b/internal/db/bundb/instance_test.go index c6f177821..3fba2af50 100644 --- a/internal/db/bundb/instance_test.go +++ b/internal/db/bundb/instance_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/config" @@ -33,68 +32,68 @@ type InstanceTestSuite struct { } func (suite *InstanceTestSuite) TestCountInstanceUsers() { - count, err := suite.db.CountInstanceUsers(context.Background(), config.GetHost()) + count, err := suite.db.CountInstanceUsers(suite.T().Context(), config.GetHost()) suite.NoError(err) suite.Equal(5, count) } func (suite *InstanceTestSuite) TestCountInstanceUsersRemote() { - count, err := suite.db.CountInstanceUsers(context.Background(), "fossbros-anonymous.io") + count, err := suite.db.CountInstanceUsers(suite.T().Context(), "fossbros-anonymous.io") suite.NoError(err) suite.Equal(1, count) } func (suite *InstanceTestSuite) TestCountInstanceStatuses() { - count, err := suite.db.CountInstanceStatuses(context.Background(), config.GetHost()) + count, err := suite.db.CountInstanceStatuses(suite.T().Context(), config.GetHost()) suite.NoError(err) suite.Equal(23, count) } func (suite *InstanceTestSuite) TestCountInstanceStatusesRemote() { - count, err := suite.db.CountInstanceStatuses(context.Background(), "fossbros-anonymous.io") + count, err := suite.db.CountInstanceStatuses(suite.T().Context(), "fossbros-anonymous.io") suite.NoError(err) suite.Equal(4, count) } func (suite *InstanceTestSuite) TestCountInstanceDomains() { - count, err := suite.db.CountInstanceDomains(context.Background(), config.GetHost()) + count, err := suite.db.CountInstanceDomains(suite.T().Context(), config.GetHost()) suite.NoError(err) suite.Equal(2, count) } func (suite *InstanceTestSuite) TestGetInstanceOK() { - instance, err := suite.db.GetInstance(context.Background(), "localhost:8080") + instance, err := suite.db.GetInstance(suite.T().Context(), "localhost:8080") suite.NoError(err) suite.NotNil(instance) } func (suite *InstanceTestSuite) TestGetInstanceNonexistent() { - instance, err := suite.db.GetInstance(context.Background(), "doesnt.exist.com") + instance, err := suite.db.GetInstance(suite.T().Context(), "doesnt.exist.com") suite.ErrorIs(err, db.ErrNoEntries) suite.Nil(instance) } func (suite *InstanceTestSuite) TestGetInstancePeers() { - peers, err := suite.db.GetInstancePeers(context.Background(), false) + peers, err := suite.db.GetInstancePeers(suite.T().Context(), false) suite.NoError(err) suite.Len(peers, 2) } func (suite *InstanceTestSuite) TestGetInstancePeersIncludeSuspended() { - peers, err := suite.db.GetInstancePeers(context.Background(), true) + peers, err := suite.db.GetInstancePeers(suite.T().Context(), true) suite.NoError(err) suite.Len(peers, 2) } func (suite *InstanceTestSuite) TestGetInstanceAccounts() { - accounts, err := suite.db.GetInstanceAccounts(context.Background(), "fossbros-anonymous.io", "", 10) + accounts, err := suite.db.GetInstanceAccounts(suite.T().Context(), "fossbros-anonymous.io", "", 10) suite.NoError(err) suite.Len(accounts, 1) } func (suite *InstanceTestSuite) TestGetInstanceModeratorAddressesOK() { // We have one admin user by default. - addresses, err := suite.db.GetInstanceModeratorAddresses(context.Background()) + addresses, err := suite.db.GetInstanceModeratorAddresses(suite.T().Context()) suite.NoError(err) suite.EqualValues([]string{"admin@example.org"}, addresses) } @@ -104,11 +103,11 @@ func (suite *InstanceTestSuite) TestGetInstanceModeratorAddressesZorkAsModerator testUser := >smodel.User{} *testUser = *suite.testUsers["local_account_1"] testUser.Moderator = util.Ptr(true) - if err := suite.db.UpdateUser(context.Background(), testUser, "moderator"); err != nil { + if err := suite.db.UpdateUser(suite.T().Context(), testUser, "moderator"); err != nil { suite.FailNow(err.Error()) } - addresses, err := suite.db.GetInstanceModeratorAddresses(context.Background()) + addresses, err := suite.db.GetInstanceModeratorAddresses(suite.T().Context()) suite.NoError(err) suite.EqualValues([]string{"admin@example.org", "zork@example.org"}, addresses) } @@ -119,11 +118,11 @@ func (suite *InstanceTestSuite) TestGetInstanceModeratorAddressesNoAdmin() { *testUser = *suite.testUsers["admin_account"] testUser.Admin = util.Ptr(false) testUser.Moderator = util.Ptr(false) - if err := suite.db.UpdateUser(context.Background(), testUser, "admin", "moderator"); err != nil { + if err := suite.db.UpdateUser(suite.T().Context(), testUser, "admin", "moderator"); err != nil { suite.FailNow(err.Error()) } - addresses, err := suite.db.GetInstanceModeratorAddresses(context.Background()) + addresses, err := suite.db.GetInstanceModeratorAddresses(suite.T().Context()) suite.ErrorIs(err, db.ErrNoEntries) suite.Empty(addresses) } -- cgit v1.2.3