diff options
| author |  Daenney <git@noreply.sourcery.dny.nu> | 2025-05-22 12:26:11 +0200 |
|---|---|---|
| committer |  kim <gruf@noreply.codeberg.org> | 2025-05-22 12:26:11 +0200 |
| commit | d5c9c4adc167cdb05e73f5105702cf340293e61c (patch) | |
| tree | 1d21fe376099864900837eba675a965517f98e5d /internal/db | |
| parent | [feature] Allow exposing allows, implement `/api/v1/domain_blocks` and `/api/... (diff) | |
| download | gotosocial-d5c9c4adc167cdb05e73f5105702cf340293e61c.tar.xz | |
[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 <git@noreply.sourcery.dny.nu>
Co-committed-by: Daenney <git@noreply.sourcery.dny.nu>
Diffstat (limited to 'internal/db')
39 files changed, 279 insertions, 308 deletions
diff --git a/internal/db/bundb/account_test.go b/internal/db/bundb/account_test.go index bb842415c..4c4cad3dd 100644 --- a/internal/db/bundb/account_test.go +++ b/internal/db/bundb/account_test.go @@ -43,53 +43,53 @@ type AccountTestSuite struct { } func (suite *AccountTestSuite) TestGetAccountStatuses() { - statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 20, false, false, "", "", false, false) + statuses, err := suite.db.GetAccountStatuses(suite.T().Context(), suite.testAccounts["local_account_1"].ID, 20, false, false, "", "", false, false) suite.NoError(err) suite.Len(statuses, 9) } func (suite *AccountTestSuite) TestGetAccountWebStatusesMediaOnly() { - statuses, err := suite.db.GetAccountWebStatuses(context.Background(), suite.testAccounts["local_account_3"], true, 20, "") + statuses, err := suite.db.GetAccountWebStatuses(suite.T().Context(), suite.testAccounts["local_account_3"], true, 20, "") suite.NoError(err) suite.Len(statuses, 2) } func (suite *AccountTestSuite) TestGetAccountStatusesPageDown() { // get the first page - statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 3, false, false, "", "", false, false) + statuses, err := suite.db.GetAccountStatuses(suite.T().Context(), suite.testAccounts["local_account_1"].ID, 3, false, false, "", "", false, false) if err != nil { suite.FailNow(err.Error()) } suite.Len(statuses, 3) // get the second page - statuses, err = suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 3, false, false, statuses[len(statuses)-1].ID, "", false, false) + statuses, err = suite.db.GetAccountStatuses(suite.T().Context(), suite.testAccounts["local_account_1"].ID, 3, false, false, statuses[len(statuses)-1].ID, "", false, false) if err != nil { suite.FailNow(err.Error()) } suite.Len(statuses, 3) // get the third page - statuses, err = suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 3, false, false, statuses[len(statuses)-1].ID, "", false, false) + statuses, err = suite.db.GetAccountStatuses(suite.T().Context(), suite.testAccounts["local_account_1"].ID, 3, false, false, statuses[len(statuses)-1].ID, "", false, false) if err != nil { suite.FailNow(err.Error()) } suite.Len(statuses, 3) // try to get the last page (should be empty) - statuses, err = suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 3, false, false, statuses[len(statuses)-1].ID, "", false, false) + statuses, err = suite.db.GetAccountStatuses(suite.T().Context(), suite.testAccounts["local_account_1"].ID, 3, false, false, statuses[len(statuses)-1].ID, "", false, false) suite.ErrorIs(err, db.ErrNoEntries) suite.Empty(statuses) } func (suite *AccountTestSuite) TestGetAccountStatusesExcludeRepliesAndReblogs() { - statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 20, true, true, "", "", false, false) + statuses, err := suite.db.GetAccountStatuses(suite.T().Context(), suite.testAccounts["local_account_1"].ID, 20, true, true, "", "", false, false) suite.NoError(err) suite.Len(statuses, 8) } func (suite *AccountTestSuite) TestGetAccountStatusesExcludeRepliesAndReblogsPublicOnly() { - statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 20, true, true, "", "", false, true) + statuses, err := suite.db.GetAccountStatuses(suite.T().Context(), suite.testAccounts["local_account_1"].ID, 20, true, true, "", "", false, true) suite.NoError(err) suite.Len(statuses, 4) } @@ -169,14 +169,14 @@ func (suite *AccountTestSuite) TestGetAccountStatusesExcludeRepliesExcludesSelfR ) for _, status := range []*gtsmodel.Status{post, reply, riposte, followup} { - if err := suite.db.PutStatus(context.Background(), status); err != nil { + if err := suite.db.PutStatus(suite.T().Context(), status); err != nil { suite.FailNowf("", "Error while adding test status with ID %s: %v", status.ID, err) return } } testAccount := suite.testAccounts["local_account_1"] - statuses, err := suite.db.GetAccountStatuses(context.Background(), testAccount.ID, 20, true, true, "", "", false, false) + statuses, err := suite.db.GetAccountStatuses(suite.T().Context(), testAccount.ID, 20, true, true, "", "", false, false) suite.NoError(err) suite.Len(statuses, 9) for _, status := range statuses { @@ -190,7 +190,7 @@ func (suite *AccountTestSuite) TestGetAccountStatusesExcludeRepliesExcludesSelfR } func (suite *AccountTestSuite) TestGetAccountStatusesMediaOnly() { - statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 20, false, false, "", "", true, false) + statuses, err := suite.db.GetAccountStatuses(suite.T().Context(), suite.testAccounts["local_account_1"].ID, 20, false, false, "", "", true, false) suite.NoError(err) suite.Len(statuses, 2) } @@ -199,7 +199,7 @@ func (suite *AccountTestSuite) TestGetAccountBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Sentinel error to mark avoiding a test case. @@ -344,7 +344,7 @@ func (suite *AccountTestSuite) TestGetAccountBy() { } func (suite *AccountTestSuite) TestGetAccountsByURLMulti() { - ctx := context.Background() + ctx := suite.T().Context() // Update admin account to have the same url as zork. testAccount1 := suite.testAccounts["local_account_1"] @@ -391,7 +391,7 @@ func (suite *AccountTestSuite) TestInsertAccountWithDefaults() { PublicKeyURI: "https://example.org/users/test_service#main-key", } - err = suite.db.Put(context.Background(), newAccount) + err = suite.db.Put(suite.T().Context(), newAccount) suite.NoError(err) suite.WithinDuration(time.Now(), newAccount.CreatedAt, 30*time.Second) @@ -403,7 +403,7 @@ func (suite *AccountTestSuite) TestInsertAccountWithDefaults() { func (suite *AccountTestSuite) TestGetAccountPinnedStatusesSomeResults() { testAccount := suite.testAccounts["admin_account"] - statuses, err := suite.db.GetAccountPinnedStatuses(context.Background(), testAccount.ID) + statuses, err := suite.db.GetAccountPinnedStatuses(suite.T().Context(), testAccount.ID) suite.NoError(err) suite.Len(statuses, 2) // This account has 2 statuses pinned. } @@ -411,7 +411,7 @@ func (suite *AccountTestSuite) TestGetAccountPinnedStatusesSomeResults() { func (suite *AccountTestSuite) TestGetAccountPinnedStatusesNothingPinned() { testAccount := suite.testAccounts["local_account_1"] - statuses, err := suite.db.GetAccountPinnedStatuses(context.Background(), testAccount.ID) + statuses, err := suite.db.GetAccountPinnedStatuses(suite.T().Context(), testAccount.ID) suite.ErrorIs(err, db.ErrNoEntries) suite.Empty(statuses) // This account has nothing pinned. } @@ -423,13 +423,13 @@ func (suite *AccountTestSuite) TestPopulateAccountWithUnknownMovedToURI() { // Set test account MovedToURI to something we don't have in the database. // We should not get an error when populating. testAccount.MovedToURI = "https://unknown-instance.example.org/users/someone_we_dont_know" - err := suite.db.PopulateAccount(context.Background(), testAccount) + err := suite.db.PopulateAccount(suite.T().Context(), testAccount) suite.NoError(err) } func (suite *AccountTestSuite) TestGetAccountsAll() { var ( - ctx = context.Background() + ctx = suite.T().Context() origin = "" status = "" mods = false @@ -464,7 +464,7 @@ func (suite *AccountTestSuite) TestGetAccountsAll() { func (suite *AccountTestSuite) TestGetAccountsMaxID() { var ( - ctx = context.Background() + ctx = suite.T().Context() origin = "" status = "" mods = false @@ -501,7 +501,7 @@ func (suite *AccountTestSuite) TestGetAccountsMaxID() { func (suite *AccountTestSuite) TestGetAccountsMinID() { var ( - ctx = context.Background() + ctx = suite.T().Context() origin = "" status = "" mods = false @@ -538,7 +538,7 @@ func (suite *AccountTestSuite) TestGetAccountsMinID() { func (suite *AccountTestSuite) TestGetAccountsModsOnly() { var ( - ctx = context.Background() + ctx = suite.T().Context() origin = "" status = "" mods = true @@ -575,7 +575,7 @@ func (suite *AccountTestSuite) TestGetAccountsModsOnly() { func (suite *AccountTestSuite) TestGetAccountsLocalWithEmail() { var ( - ctx = context.Background() + ctx = suite.T().Context() origin = "local" status = "" mods = false @@ -612,7 +612,7 @@ func (suite *AccountTestSuite) TestGetAccountsLocalWithEmail() { func (suite *AccountTestSuite) TestGetAccountsWithIP() { var ( - ctx = context.Background() + ctx = suite.T().Context() origin = "" status = "" mods = false @@ -649,7 +649,7 @@ func (suite *AccountTestSuite) TestGetAccountsWithIP() { func (suite *AccountTestSuite) TestGetPendingAccounts() { var ( - ctx = context.Background() + ctx = suite.T().Context() origin = "" status = "pending" mods = false @@ -685,7 +685,7 @@ func (suite *AccountTestSuite) TestGetPendingAccounts() { } func (suite *AccountTestSuite) TestAccountStatsAll() { - ctx := context.Background() + ctx := suite.T().Context() for _, account := range suite.testAccounts { // Get stats for the first time. They // should all be generated now since diff --git a/internal/db/bundb/admin_test.go b/internal/db/bundb/admin_test.go index 247431e87..60ff0359e 100644 --- a/internal/db/bundb/admin_test.go +++ b/internal/db/bundb/admin_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" @@ -31,31 +30,31 @@ type AdminTestSuite struct { } func (suite *AdminTestSuite) TestIsUsernameAvailableNo() { - available, err := suite.db.IsUsernameAvailable(context.Background(), "the_mighty_zork") + available, err := suite.db.IsUsernameAvailable(suite.T().Context(), "the_mighty_zork") suite.NoError(err) suite.False(available) } func (suite *AdminTestSuite) TestIsUsernameAvailableYes() { - available, err := suite.db.IsUsernameAvailable(context.Background(), "someone_completely_different") + available, err := suite.db.IsUsernameAvailable(suite.T().Context(), "someone_completely_different") suite.NoError(err) suite.True(available) } func (suite *AdminTestSuite) TestIsEmailAvailableNo() { - available, err := suite.db.IsEmailAvailable(context.Background(), "zork@example.org") + available, err := suite.db.IsEmailAvailable(suite.T().Context(), "zork@example.org") suite.NoError(err) suite.False(available) } func (suite *AdminTestSuite) TestIsEmailAvailableYes() { - available, err := suite.db.IsEmailAvailable(context.Background(), "someone@somewhere.com") + available, err := suite.db.IsEmailAvailable(suite.T().Context(), "someone@somewhere.com") suite.NoError(err) suite.True(available) } func (suite *AdminTestSuite) TestIsEmailAvailableDomainBlocked() { - if err := suite.db.Put(context.Background(), >smodel.EmailDomainBlock{ + if err := suite.db.Put(suite.T().Context(), >smodel.EmailDomainBlock{ ID: "01GEEV2R2YC5GRSN96761YJE47", Domain: "somewhere.com", CreatedByAccountID: suite.testAccounts["admin_account"].ID, @@ -63,7 +62,7 @@ func (suite *AdminTestSuite) TestIsEmailAvailableDomainBlocked() { suite.FailNow(err.Error()) } - available, err := suite.db.IsEmailAvailable(context.Background(), "someone@somewhere.com") + available, err := suite.db.IsEmailAvailable(suite.T().Context(), "someone@somewhere.com") suite.EqualError(err, "email domain somewhere.com is blocked") suite.False(available) } @@ -78,22 +77,22 @@ func (suite *AdminTestSuite) TestCreateInstanceAccount() { testrig.CreateTestTables(suite.db) // make sure there's no instance account in the db yet - acct, err := suite.db.GetInstanceAccount(context.Background(), "") + acct, err := suite.db.GetInstanceAccount(suite.T().Context(), "") suite.Error(err) suite.Nil(acct) // create it - err = suite.db.CreateInstanceAccount(context.Background()) + err = suite.db.CreateInstanceAccount(suite.T().Context()) suite.NoError(err) // and now check it exists - acct, err = suite.db.GetInstanceAccount(context.Background(), "") + acct, err = suite.db.GetInstanceAccount(suite.T().Context(), "") suite.NoError(err) suite.NotNil(acct) } func (suite *AdminTestSuite) TestNewSignupWithNoInstanceApp() { - ctx := context.Background() + ctx := suite.T().Context() // Delete the instance app. if err := suite.state.DB.DeleteApplicationByID( diff --git a/internal/db/bundb/application_test.go b/internal/db/bundb/application_test.go index 858cb15b6..a9ef80ce4 100644 --- a/internal/db/bundb/application_test.go +++ b/internal/db/bundb/application_test.go @@ -36,7 +36,7 @@ func (suite *ApplicationTestSuite) TestGetApplicationBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Sentinel error to mark avoiding a test case. @@ -86,7 +86,7 @@ func (suite *ApplicationTestSuite) TestDeleteApplicationBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() for _, app := range suite.testApplications { @@ -117,7 +117,7 @@ func (suite *ApplicationTestSuite) TestDeleteApplicationBy() { } func (suite *ApplicationTestSuite) TestGetAllTokens() { - tokens, err := suite.db.GetAllTokens(context.Background()) + tokens, err := suite.db.GetAllTokens(suite.T().Context()) if err != nil { suite.FailNow(err.Error()) } @@ -125,7 +125,7 @@ func (suite *ApplicationTestSuite) TestGetAllTokens() { } func (suite *ApplicationTestSuite) TestDeleteTokensByClientID() { - ctx := context.Background() + ctx := suite.T().Context() // Delete tokens by each app. for _, app := range suite.testApplications { @@ -147,7 +147,7 @@ func (suite *ApplicationTestSuite) TestDeleteTokensByUnknownClientID() { // Should not return ErrNoRows even though // the client with given ID doesn't exist. if err := suite.state.DB.DeleteTokensByClientID( - context.Background(), + suite.T().Context(), "01JPJ4NCGH6GHY7ZVYBHNP55XS", ); err != nil { suite.FailNow(err.Error()) diff --git a/internal/db/bundb/basic_test.go b/internal/db/bundb/basic_test.go index bdda1cad3..cc4303666 100644 --- a/internal/db/bundb/basic_test.go +++ b/internal/db/bundb/basic_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "crypto/rand" "crypto/rsa" "testing" @@ -37,7 +36,7 @@ func (suite *BasicTestSuite) TestGetAccountByID() { testAccount := suite.testAccounts["local_account_1"] a := >smodel.Account{} - err := suite.db.GetByID(context.Background(), testAccount.ID, a) + err := suite.db.GetByID(suite.T().Context(), testAccount.ID, a) suite.NoError(err) } @@ -60,12 +59,12 @@ func (suite *BasicTestSuite) TestPutAccountWithBunDefaultFields() { PublicKey: &key.PublicKey, } - if err := suite.db.Put(context.Background(), testAccount); err != nil { + if err := suite.db.Put(suite.T().Context(), testAccount); err != nil { suite.FailNow(err.Error()) } a := >smodel.Account{} - if err := suite.db.GetByID(context.Background(), testAccount.ID, a); err != nil { + if err := suite.db.GetByID(suite.T().Context(), testAccount.ID, a); err != nil { suite.FailNow(err.Error()) } @@ -111,7 +110,7 @@ func (suite *BasicTestSuite) TestPutAccountWithBunDefaultFields() { func (suite *BasicTestSuite) TestGetAllStatuses() { s := []*gtsmodel.Status{} - err := suite.db.GetAll(context.Background(), &s) + err := suite.db.GetAll(suite.T().Context(), &s) suite.NoError(err) suite.Len(s, 30) } @@ -125,7 +124,7 @@ func (suite *BasicTestSuite) TestGetAllNotNull() { a := []*gtsmodel.Account{} - err := suite.db.GetWhere(context.Background(), where, &a) + err := suite.db.GetWhere(suite.T().Context(), where, &a) suite.NoError(err) suite.NotEmpty(a) diff --git a/internal/db/bundb/bundbnew_test.go b/internal/db/bundb/bundbnew_test.go index 6dbe2120b..870086cd9 100644 --- a/internal/db/bundb/bundbnew_test.go +++ b/internal/db/bundb/bundbnew_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/config" @@ -32,7 +31,7 @@ type BundbNewTestSuite struct { func (suite *BundbNewTestSuite) TestCreateNewDB() { // create a new db with standard test settings - db, err := bundb.NewBunDBService(context.Background(), nil) + db, err := bundb.NewBunDBService(suite.T().Context(), nil) suite.NoError(err) suite.NotNil(db) } @@ -41,7 +40,7 @@ func (suite *BundbNewTestSuite) TestCreateNewSqliteDBNoAddress() { // create a new db with no address specified config.SetDbAddress("") config.SetDbType("sqlite") - db, err := bundb.NewBunDBService(context.Background(), nil) + db, err := bundb.NewBunDBService(suite.T().Context(), nil) suite.EqualError(err, "'db-address' was not set when attempting to start sqlite") suite.Nil(db) } 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) } diff --git a/internal/db/bundb/domain_test.go b/internal/db/bundb/domain_test.go index 553cdeb80..8ebe0a2ba 100644 --- a/internal/db/bundb/domain_test.go +++ b/internal/db/bundb/domain_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "slices" "testing" "time" @@ -32,7 +31,7 @@ type DomainTestSuite struct { } func (suite *DomainTestSuite) TestIsDomainBlocked() { - ctx := context.Background() + ctx := suite.T().Context() domainBlock := >smodel.DomainBlock{ ID: "01G204214Y9TNJEBX39C7G88SW", @@ -57,7 +56,7 @@ func (suite *DomainTestSuite) TestIsDomainBlocked() { } func (suite *DomainTestSuite) TestIsDomainBlockedWithAllow() { - ctx := context.Background() + ctx := suite.T().Context() domainBlock := >smodel.DomainBlock{ ID: "01G204214Y9TNJEBX39C7G88SW", @@ -110,7 +109,7 @@ func (suite *DomainTestSuite) TestIsDomainBlockedWithAllow() { } func (suite *DomainTestSuite) TestIsDomainBlockedWildcard() { - ctx := context.Background() + ctx := suite.T().Context() domainBlock := >smodel.DomainBlock{ ID: "01G204214Y9TNJEBX39C7G88SW", @@ -142,7 +141,7 @@ func (suite *DomainTestSuite) TestIsDomainBlockedWildcard() { } func (suite *DomainTestSuite) TestIsDomainBlockedNonASCII() { - ctx := context.Background() + ctx := suite.T().Context() now := time.Now() @@ -178,7 +177,7 @@ func (suite *DomainTestSuite) TestIsDomainBlockedNonASCII() { } func (suite *DomainTestSuite) TestIsDomainBlockedNonASCII2() { - ctx := context.Background() + ctx := suite.T().Context() now := time.Now() @@ -214,7 +213,7 @@ func (suite *DomainTestSuite) TestIsDomainBlockedNonASCII2() { } func (suite *DomainTestSuite) TestIsOtherDomainBlockedWildcardAndExplicit() { - ctx := context.Background() + ctx := suite.T().Context() blocks := []*gtsmodel.DomainBlock{ { diff --git a/internal/db/bundb/domainpermissiondraft_test.go b/internal/db/bundb/domainpermissiondraft_test.go index b3bb20d00..abbfaf202 100644 --- a/internal/db/bundb/domainpermissiondraft_test.go +++ b/internal/db/bundb/domainpermissiondraft_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "errors" "testing" @@ -34,7 +33,7 @@ type DomainPermissionDraftTestSuite struct { func (suite *DomainPermissionDraftTestSuite) TestPermDraftCreateGetDelete() { var ( - ctx = context.Background() + ctx = suite.T().Context() draft = >smodel.DomainPermissionDraft{ ID: "01JCZN614XG85GCGAMSV9ZZAEJ", PermissionType: gtsmodel.DomainPermissionBlock, diff --git a/internal/db/bundb/domainpermissionexclude_test.go b/internal/db/bundb/domainpermissionexclude_test.go index dd55d7add..a73fa300a 100644 --- a/internal/db/bundb/domainpermissionexclude_test.go +++ b/internal/db/bundb/domainpermissionexclude_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "errors" "testing" @@ -34,7 +33,7 @@ type DomainPermissionExcludeTestSuite struct { func (suite *DomainPermissionExcludeTestSuite) TestPermExcludeCreateGetDelete() { var ( - ctx = context.Background() + ctx = suite.T().Context() exclude = >smodel.DomainPermissionExclude{ ID: "01JCZN614XG85GCGAMSV9ZZAEJ", Domain: "exämple.org", @@ -103,7 +102,7 @@ func (suite *DomainPermissionExcludeTestSuite) TestPermExcludeCreateGetDelete() func (suite *DomainPermissionExcludeTestSuite) TestExcluded() { var ( - ctx = context.Background() + ctx = suite.T().Context() createdByAccountID = suite.testAccounts["admin_account"].ID ) diff --git a/internal/db/bundb/domainpermissionsubscription_test.go b/internal/db/bundb/domainpermissionsubscription_test.go index b05330138..bbba85711 100644 --- a/internal/db/bundb/domainpermissionsubscription_test.go +++ b/internal/db/bundb/domainpermissionsubscription_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" @@ -31,7 +30,7 @@ type DomainPermissionSubscriptionTestSuite struct { func (suite *DomainPermissionSubscriptionTestSuite) TestCount() { var ( - ctx = context.Background() + ctx = suite.T().Context() testAccount = suite.testAccounts["admin_account"] permSub = >smodel.DomainPermissionSubscription{ ID: "01JGV3VZ72K58BYW8H5GEVBZGN", diff --git a/internal/db/bundb/emoji_test.go b/internal/db/bundb/emoji_test.go index a71678eac..3c10b1a98 100644 --- a/internal/db/bundb/emoji_test.go +++ b/internal/db/bundb/emoji_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/db" @@ -32,7 +31,7 @@ type EmojiTestSuite struct { } func (suite *EmojiTestSuite) TestGetUseableEmojis() { - emojis, err := suite.db.GetUseableEmojis(context.Background()) + emojis, err := suite.db.GetUseableEmojis(suite.T().Context()) suite.NoError(err) suite.Equal(1, len(emojis)) @@ -42,16 +41,16 @@ func (suite *EmojiTestSuite) TestGetUseableEmojis() { func (suite *EmojiTestSuite) TestDeleteEmojiByID() { testEmoji := suite.testEmojis["rainbow"] - err := suite.db.DeleteEmojiByID(context.Background(), testEmoji.ID) + err := suite.db.DeleteEmojiByID(suite.T().Context(), testEmoji.ID) suite.NoError(err) - dbEmoji, err := suite.db.GetEmojiByID(context.Background(), testEmoji.ID) + dbEmoji, err := suite.db.GetEmojiByID(suite.T().Context(), testEmoji.ID) suite.Nil(dbEmoji) suite.ErrorIs(err, db.ErrNoEntries) } func (suite *EmojiTestSuite) TestGetEmojiByStaticURL() { - emoji, err := suite.db.GetEmojiByStaticURL(context.Background(), "http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/static/01F8MH9H8E4VG3KDYJR9EGPXCQ.png") + emoji, err := suite.db.GetEmojiByStaticURL(suite.T().Context(), "http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/static/01F8MH9H8E4VG3KDYJR9EGPXCQ.png") suite.NoError(err) suite.NotNil(emoji) suite.Equal("rainbow", emoji.Shortcode) @@ -60,7 +59,7 @@ func (suite *EmojiTestSuite) TestGetEmojiByStaticURL() { } func (suite *EmojiTestSuite) TestGetAllEmojis() { - emojis, err := suite.db.GetEmojisBy(context.Background(), db.EmojiAllDomains, true, true, "", "", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), db.EmojiAllDomains, true, true, "", "", "", 0) suite.NoError(err) suite.Equal(2, len(emojis)) @@ -69,7 +68,7 @@ func (suite *EmojiTestSuite) TestGetAllEmojis() { } func (suite *EmojiTestSuite) TestGetAllEmojisLimit1() { - emojis, err := suite.db.GetEmojisBy(context.Background(), db.EmojiAllDomains, true, true, "", "", "", 1) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), db.EmojiAllDomains, true, true, "", "", "", 1) suite.NoError(err) suite.Equal(1, len(emojis)) @@ -77,7 +76,7 @@ func (suite *EmojiTestSuite) TestGetAllEmojisLimit1() { } func (suite *EmojiTestSuite) TestGetAllEmojisMaxID() { - emojis, err := suite.db.GetEmojisBy(context.Background(), db.EmojiAllDomains, true, true, "", "rainbow@", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), db.EmojiAllDomains, true, true, "", "rainbow@", "", 0) suite.NoError(err) suite.Equal(1, len(emojis)) @@ -85,7 +84,7 @@ func (suite *EmojiTestSuite) TestGetAllEmojisMaxID() { } func (suite *EmojiTestSuite) TestGetAllEmojisMinID() { - emojis, err := suite.db.GetEmojisBy(context.Background(), db.EmojiAllDomains, true, true, "", "", "yell@fossbros-anonymous.io", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), db.EmojiAllDomains, true, true, "", "", "yell@fossbros-anonymous.io", 0) suite.NoError(err) suite.Equal(1, len(emojis)) @@ -93,14 +92,14 @@ func (suite *EmojiTestSuite) TestGetAllEmojisMinID() { } func (suite *EmojiTestSuite) TestGetAllDisabledEmojis() { - emojis, err := suite.db.GetEmojisBy(context.Background(), db.EmojiAllDomains, true, false, "", "", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), db.EmojiAllDomains, true, false, "", "", "", 0) suite.ErrorIs(err, db.ErrNoEntries) suite.Equal(0, len(emojis)) } func (suite *EmojiTestSuite) TestGetAllEnabledEmojis() { - emojis, err := suite.db.GetEmojisBy(context.Background(), db.EmojiAllDomains, false, true, "", "", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), db.EmojiAllDomains, false, true, "", "", "", 0) suite.NoError(err) suite.Equal(2, len(emojis)) @@ -109,7 +108,7 @@ func (suite *EmojiTestSuite) TestGetAllEnabledEmojis() { } func (suite *EmojiTestSuite) TestGetLocalEnabledEmojis() { - emojis, err := suite.db.GetEmojisBy(context.Background(), "", false, true, "", "", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), "", false, true, "", "", "", 0) suite.NoError(err) suite.Equal(1, len(emojis)) @@ -117,21 +116,21 @@ func (suite *EmojiTestSuite) TestGetLocalEnabledEmojis() { } func (suite *EmojiTestSuite) TestGetLocalDisabledEmojis() { - emojis, err := suite.db.GetEmojisBy(context.Background(), "", true, false, "", "", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), "", true, false, "", "", "", 0) suite.ErrorIs(err, db.ErrNoEntries) suite.Equal(0, len(emojis)) } func (suite *EmojiTestSuite) TestGetAllEmojisFromDomain() { - emojis, err := suite.db.GetEmojisBy(context.Background(), "peepee.poopoo", true, true, "", "", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), "peepee.poopoo", true, true, "", "", "", 0) suite.ErrorIs(err, db.ErrNoEntries) suite.Equal(0, len(emojis)) } func (suite *EmojiTestSuite) TestGetAllEmojisFromDomain2() { - emojis, err := suite.db.GetEmojisBy(context.Background(), "fossbros-anonymous.io", true, true, "", "", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), "fossbros-anonymous.io", true, true, "", "", "", 0) suite.NoError(err) suite.Equal(1, len(emojis)) @@ -139,7 +138,7 @@ func (suite *EmojiTestSuite) TestGetAllEmojisFromDomain2() { } func (suite *EmojiTestSuite) TestGetSpecificEmojisFromDomain2() { - emojis, err := suite.db.GetEmojisBy(context.Background(), "fossbros-anonymous.io", true, true, "yell", "", "", 0) + emojis, err := suite.db.GetEmojisBy(suite.T().Context(), "fossbros-anonymous.io", true, true, "yell", "", "", 0) suite.NoError(err) suite.Equal(1, len(emojis)) @@ -147,7 +146,7 @@ func (suite *EmojiTestSuite) TestGetSpecificEmojisFromDomain2() { } func (suite *EmojiTestSuite) TestGetEmojiCategories() { - categories, err := suite.db.GetEmojiCategories(context.Background()) + categories, err := suite.db.GetEmojiCategories(suite.T().Context()) suite.NoError(err) suite.Len(categories, 2) // check alphabetical order @@ -156,7 +155,7 @@ func (suite *EmojiTestSuite) TestGetEmojiCategories() { } func (suite *EmojiTestSuite) TestGetEmojiCategory() { - category, err := suite.db.GetEmojiCategory(context.Background(), testrig.NewTestEmojiCategories()["reactions"].ID) + category, err := suite.db.GetEmojiCategory(suite.T().Context(), testrig.NewTestEmojiCategories()["reactions"].ID) suite.NoError(err) suite.NotNil(category) } @@ -167,7 +166,7 @@ func (suite *EmojiTestSuite) TestUpdateEmojiCategory() { testEmoji.CategoryID = "" - err := suite.db.UpdateEmoji(context.Background(), testEmoji, "category_id") + err := suite.db.UpdateEmoji(suite.T().Context(), testEmoji, "category_id") suite.NoError(err) } diff --git a/internal/db/bundb/errors_test.go b/internal/db/bundb/errors_test.go index a235e185b..b90e3b5e6 100644 --- a/internal/db/bundb/errors_test.go +++ b/internal/db/bundb/errors_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "errors" "testing" @@ -38,7 +37,7 @@ func (suite *ErrorsTestSuite) TestErrorAlreadyExists() { } var ( - ctx = context.Background() + ctx = suite.T().Context() initialFollow = >smodel.Follow{ ID: "01HD11D8JH5V64GJRFDA7VFNDX", URI: "https://example.org/unique_uri", diff --git a/internal/db/bundb/filter_test.go b/internal/db/bundb/filter_test.go index faa2957d6..12f3476ed 100644 --- a/internal/db/bundb/filter_test.go +++ b/internal/db/bundb/filter_test.go @@ -54,7 +54,7 @@ func (suite *FilterTestSuite) TestFilterCRUD() { filter.Keywords = []*gtsmodel.FilterKeyword{filterKeyword} // Create new cancellable test context. - ctx := context.Background() + ctx := suite.T().Context() ctx, cncl := context.WithCancel(ctx) defer cncl() @@ -249,7 +249,7 @@ func (suite *FilterTestSuite) TestFilterCRUD() { func (suite *FilterTestSuite) TestFilterTitleOverlap() { var ( - ctx = context.Background() + ctx = suite.T().Context() account1 = "01HNEJXCPRTJVJY9MV0VVHGD47" account2 = "01JAG5BRJPJYA0FSA5HR2MMFJH" ) diff --git a/internal/db/bundb/filterkeyword_test.go b/internal/db/bundb/filterkeyword_test.go index e1482a225..ab814d413 100644 --- a/internal/db/bundb/filterkeyword_test.go +++ b/internal/db/bundb/filterkeyword_test.go @@ -41,7 +41,7 @@ func (suite *FilterTestSuite) TestFilterKeywordCRUD() { } // Create new cancellable test context. - ctx := context.Background() + ctx := suite.T().Context() ctx, cncl := context.WithCancel(ctx) defer cncl() diff --git a/internal/db/bundb/filterstatus_test.go b/internal/db/bundb/filterstatus_test.go index e5dceb7f1..9485ee3f7 100644 --- a/internal/db/bundb/filterstatus_test.go +++ b/internal/db/bundb/filterstatus_test.go @@ -41,7 +41,7 @@ func (suite *FilterTestSuite) TestFilterStatusCRD() { } // Create new cancellable test context. - ctx := context.Background() + ctx := suite.T().Context() ctx, cncl := context.WithCancel(ctx) defer cncl() diff --git a/internal/db/bundb/headerfilter_test.go b/internal/db/bundb/headerfilter_test.go index 85a2dd03e..d9a9e38b2 100644 --- a/internal/db/bundb/headerfilter_test.go +++ b/internal/db/bundb/headerfilter_test.go @@ -68,7 +68,7 @@ func (suite *HeaderFilterTestSuite) testHeaderFilterGetPutUpdateDelete( } // Create new cancellable test context. - ctx := context.Background() + ctx := suite.T().Context() ctx, cncl := context.WithCancel(ctx) defer cncl() 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) } diff --git a/internal/db/bundb/interaction_test.go b/internal/db/bundb/interaction_test.go index 4518f7ac9..564b3a3f2 100644 --- a/internal/db/bundb/interaction_test.go +++ b/internal/db/bundb/interaction_test.go @@ -127,7 +127,7 @@ func (suite *InteractionTestSuite) markInteractionsPending( func (suite *InteractionTestSuite) TestGetPending() { var ( testStatus = suite.testStatuses["local_account_1_status_1"] - ctx = context.Background() + ctx = suite.T().Context() acctID = suite.testAccounts["local_account_1"].ID statusID = "" likes = true @@ -175,7 +175,7 @@ func (suite *InteractionTestSuite) TestGetPending() { func (suite *InteractionTestSuite) TestGetPendingRepliesOnly() { var ( testStatus = suite.testStatuses["local_account_1_status_1"] - ctx = context.Background() + ctx = suite.T().Context() acctID = suite.testAccounts["local_account_1"].ID statusID = "" likes = false @@ -211,7 +211,7 @@ func (suite *InteractionTestSuite) TestGetPendingRepliesOnly() { func (suite *InteractionTestSuite) TestInteractionRejected() { var ( - ctx = context.Background() + ctx = suite.T().Context() req = new(gtsmodel.InteractionRequest) ) diff --git a/internal/db/bundb/list_test.go b/internal/db/bundb/list_test.go index dde336c46..f71b5e7b0 100644 --- a/internal/db/bundb/list_test.go +++ b/internal/db/bundb/list_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "slices" "testing" @@ -102,7 +101,7 @@ func (suite *ListTestSuite) checkListEntries(expected []*gtsmodel.ListEntry, act func (suite *ListTestSuite) TestGetListByID() { testList, _, _ := suite.testStructs() - dbList, err := suite.db.GetListByID(context.Background(), testList.ID) + dbList, err := suite.db.GetListByID(suite.T().Context(), testList.ID) if err != nil { suite.FailNow(err.Error()) } @@ -113,7 +112,7 @@ func (suite *ListTestSuite) TestGetListByID() { func (suite *ListTestSuite) TestGetListsForAccountID() { testList, _, testAccount := suite.testStructs() - dbLists, err := suite.db.GetListsByAccountID(context.Background(), testAccount.ID) + dbLists, err := suite.db.GetListsByAccountID(suite.T().Context(), testAccount.ID) if err != nil { suite.FailNow(err.Error()) } @@ -126,7 +125,7 @@ func (suite *ListTestSuite) TestGetListsForAccountID() { } func (suite *ListTestSuite) TestPutList() { - ctx := context.Background() + ctx := suite.T().Context() _, _, testAccount := suite.testStructs() testList := >smodel.List{ @@ -150,7 +149,7 @@ func (suite *ListTestSuite) TestPutList() { } func (suite *ListTestSuite) TestUpdateList() { - ctx := context.Background() + ctx := suite.T().Context() testList, _, _ := suite.testStructs() // Get List in the cache first. @@ -176,7 +175,7 @@ func (suite *ListTestSuite) TestUpdateList() { } func (suite *ListTestSuite) TestDeleteList() { - ctx := context.Background() + ctx := suite.T().Context() testList, _, _ := suite.testStructs() // Get List in the cache first. @@ -205,7 +204,7 @@ func (suite *ListTestSuite) TestDeleteList() { } func (suite *ListTestSuite) TestPutListEntries() { - ctx := context.Background() + ctx := suite.T().Context() testList, testEntries, _ := suite.testStructs() listEntries := []*gtsmodel.ListEntry{ @@ -241,7 +240,7 @@ func (suite *ListTestSuite) TestPutListEntries() { } func (suite *ListTestSuite) TestDeleteListEntry() { - ctx := context.Background() + ctx := suite.T().Context() testList, testEntries, _ := suite.testStructs() // Delete the first entry. @@ -261,7 +260,7 @@ func (suite *ListTestSuite) TestDeleteListEntry() { } func (suite *ListTestSuite) TestDeleteAllListEntriesByFollows() { - ctx := context.Background() + ctx := suite.T().Context() testList, testEntries, _ := suite.testStructs() // Delete the first entry. @@ -280,7 +279,7 @@ func (suite *ListTestSuite) TestDeleteAllListEntriesByFollows() { } func (suite *ListTestSuite) TestListIncludesAccount() { - ctx := context.Background() + ctx := suite.T().Context() testList, _, _ := suite.testStructs() for accountID, expected := range map[string]bool{ diff --git a/internal/db/bundb/markers_test.go b/internal/db/bundb/markers_test.go index 618fb3383..6541c3deb 100644 --- a/internal/db/bundb/markers_test.go +++ b/internal/db/bundb/markers_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "time" @@ -35,7 +34,7 @@ type MarkersTestSuite struct { } func (suite *MarkersTestSuite) TestGetExisting() { - ctx := context.Background() + ctx := suite.T().Context() // This account has home and notifications markers set. localAccount1 := suite.testAccounts["local_account_1"] @@ -49,7 +48,7 @@ func (suite *MarkersTestSuite) TestGetExisting() { } func (suite *MarkersTestSuite) TestGetUnset() { - ctx := context.Background() + ctx := suite.T().Context() // This account has no markers set. localAccount2 := suite.testAccounts["local_account_2"] @@ -60,7 +59,7 @@ func (suite *MarkersTestSuite) TestGetUnset() { } func (suite *MarkersTestSuite) TestUpdateExisting() { - ctx := context.Background() + ctx := suite.T().Context() now := time.Now() // This account has home and notifications markers set. @@ -92,7 +91,7 @@ func (suite *MarkersTestSuite) TestUpdateExisting() { } func (suite *MarkersTestSuite) TestUpdateUnset() { - ctx := context.Background() + ctx := suite.T().Context() now := time.Now() // This account has no markers set. diff --git a/internal/db/bundb/media_test.go b/internal/db/bundb/media_test.go index 6237d96b1..86da44148 100644 --- a/internal/db/bundb/media_test.go +++ b/internal/db/bundb/media_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "time" @@ -31,19 +30,19 @@ type MediaTestSuite struct { func (suite *MediaTestSuite) TestGetAttachmentByID() { testAttachment := suite.testAttachments["admin_account_status_1_attachment_1"] - attachment, err := suite.db.GetAttachmentByID(context.Background(), testAttachment.ID) + attachment, err := suite.db.GetAttachmentByID(suite.T().Context(), testAttachment.ID) suite.NoError(err) suite.NotNil(attachment) } func (suite *MediaTestSuite) TestGetOlder() { - attachments, err := suite.db.GetCachedAttachmentsOlderThan(context.Background(), time.Now(), 20) + attachments, err := suite.db.GetCachedAttachmentsOlderThan(suite.T().Context(), time.Now(), 20) suite.NoError(err) suite.Len(attachments, 3) } func (suite *MediaTestSuite) TestGetCachedAttachmentsOlderThan() { - ctx := context.Background() + ctx := suite.T().Context() attachments, err := suite.db.GetCachedAttachmentsOlderThan(ctx, time.Now(), 20) suite.NoError(err) diff --git a/internal/db/bundb/mention_test.go b/internal/db/bundb/mention_test.go index 9ec087607..f4fb03d2f 100644 --- a/internal/db/bundb/mention_test.go +++ b/internal/db/bundb/mention_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "github.com/stretchr/testify/suite" @@ -31,7 +30,7 @@ type MentionTestSuite struct { func (suite *MentionTestSuite) TestGetMention() { m := suite.testMentions["local_user_2_mention_zork"] - dbMention, err := suite.db.GetMention(context.Background(), m.ID) + dbMention, err := suite.db.GetMention(suite.T().Context(), m.ID) suite.NoError(err) suite.NotNil(dbMention) suite.Equal(m.ID, dbMention.ID) @@ -46,7 +45,7 @@ func (suite *MentionTestSuite) TestGetMention() { func (suite *MentionTestSuite) TestGetMentions() { m := suite.testMentions["local_user_2_mention_zork"] - dbMentions, err := suite.db.GetMentions(context.Background(), []string{m.ID}) + dbMentions, err := suite.db.GetMentions(suite.T().Context(), []string{m.ID}) suite.NoError(err) suite.Len(dbMentions, 1) dbMention := dbMentions[0] diff --git a/internal/db/bundb/move_test.go b/internal/db/bundb/move_test.go index c3e0dce3d..79fbf504f 100644 --- a/internal/db/bundb/move_test.go +++ b/internal/db/bundb/move_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "time" @@ -32,7 +31,7 @@ type MoveTestSuite struct { } func (suite *MoveTestSuite) TestMoveIntegration() { - ctx := context.Background() + ctx := suite.T().Context() firstMove := >smodel.Move{ ID: "01HPPN38MZYEC6WBTR21J6241N", OriginURI: "https://example.org/users/my_old_account", diff --git a/internal/db/bundb/notification_test.go b/internal/db/bundb/notification_test.go index b3104f905..10b82b7ce 100644 --- a/internal/db/bundb/notification_test.go +++ b/internal/db/bundb/notification_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "errors" "testing" "time" @@ -74,7 +73,7 @@ func (suite *NotificationTestSuite) spamNotifs() { Read: util.Ptr(false), } - if err := suite.db.PutNotification(context.Background(), notif); err != nil { + if err := suite.db.PutNotification(suite.T().Context(), notif); err != nil { panic(err) } } @@ -91,7 +90,7 @@ func (suite *NotificationTestSuite) TestGetAccountNotificationsWithSpam() { testAccount := suite.testAccounts["local_account_1"] before := time.Now() notifications, err := suite.db.GetAccountNotifications( - gtscontext.SetBarebones(context.Background()), + gtscontext.SetBarebones(suite.T().Context()), testAccount.ID, &paging.Page{ Min: paging.EitherMinID("", id.Lowest), @@ -115,7 +114,7 @@ func (suite *NotificationTestSuite) TestGetAccountNotificationsWithoutSpam() { testAccount := suite.testAccounts["local_account_1"] before := time.Now() notifications, err := suite.db.GetAccountNotifications( - gtscontext.SetBarebones(context.Background()), + gtscontext.SetBarebones(suite.T().Context()), testAccount.ID, &paging.Page{ Min: paging.EitherMinID("", id.Lowest), @@ -141,7 +140,7 @@ func (suite *NotificationTestSuite) TestDeleteNotificationsWithSpam() { // Test getting notifs first. notifications, err := suite.db.GetAccountNotifications( - gtscontext.SetBarebones(context.Background()), + gtscontext.SetBarebones(suite.T().Context()), testAccount.ID, &paging.Page{ Min: paging.EitherMinID("", id.Lowest), @@ -157,13 +156,13 @@ func (suite *NotificationTestSuite) TestDeleteNotificationsWithSpam() { suite.Len(notifications, 20) // Now delete. - if err := suite.db.DeleteNotifications(context.Background(), nil, testAccount.ID, ""); err != nil { + if err := suite.db.DeleteNotifications(suite.T().Context(), nil, testAccount.ID, ""); err != nil { suite.FailNow(err.Error()) } // Now try getting again. notifications, err = suite.db.GetAccountNotifications( - gtscontext.SetBarebones(context.Background()), + gtscontext.SetBarebones(suite.T().Context()), testAccount.ID, &paging.Page{ Min: paging.EitherMinID("", id.Lowest), @@ -182,11 +181,11 @@ func (suite *NotificationTestSuite) TestDeleteNotificationsWithSpam() { func (suite *NotificationTestSuite) TestDeleteNotificationsWithTwoAccounts() { suite.spamNotifs() testAccount := suite.testAccounts["local_account_1"] - err := suite.db.DeleteNotifications(context.Background(), nil, testAccount.ID, "") + err := suite.db.DeleteNotifications(suite.T().Context(), nil, testAccount.ID, "") suite.NoError(err) notifications, err := suite.db.GetAccountNotifications( - gtscontext.SetBarebones(context.Background()), + gtscontext.SetBarebones(suite.T().Context()), testAccount.ID, &paging.Page{ Min: paging.EitherMinID("", id.Lowest), @@ -201,7 +200,7 @@ func (suite *NotificationTestSuite) TestDeleteNotificationsWithTwoAccounts() { suite.Empty(notifications) notif := []*gtsmodel.Notification{} - err = suite.db.GetAll(context.Background(), ¬if) + err = suite.db.GetAll(suite.T().Context(), ¬if) suite.NoError(err) suite.NotEmpty(notif) } @@ -209,12 +208,12 @@ func (suite *NotificationTestSuite) TestDeleteNotificationsWithTwoAccounts() { func (suite *NotificationTestSuite) TestDeleteNotificationsOriginatingFromAccount() { testAccount := suite.testAccounts["local_account_2"] - if err := suite.db.DeleteNotifications(context.Background(), nil, "", testAccount.ID); err != nil { + if err := suite.db.DeleteNotifications(suite.T().Context(), nil, "", testAccount.ID); err != nil { suite.FailNow(err.Error()) } notif := []*gtsmodel.Notification{} - if err := suite.db.GetAll(context.Background(), ¬if); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), ¬if); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } @@ -229,12 +228,12 @@ func (suite *NotificationTestSuite) TestDeleteNotificationsOriginatingFromAndTar originAccount := suite.testAccounts["local_account_2"] targetAccount := suite.testAccounts["admin_account"] - if err := suite.db.DeleteNotifications(context.Background(), nil, targetAccount.ID, originAccount.ID); err != nil { + if err := suite.db.DeleteNotifications(suite.T().Context(), nil, targetAccount.ID, originAccount.ID); err != nil { suite.FailNow(err.Error()) } notif := []*gtsmodel.Notification{} - if err := suite.db.GetAll(context.Background(), ¬if); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), ¬if); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } @@ -253,12 +252,12 @@ func (suite *NotificationTestSuite) TestDeleteNotificationsOriginatingFromAndTar func (suite *NotificationTestSuite) TestDeleteNotificationsPertainingToStatusID() { testStatus := suite.testStatuses["local_account_1_status_1"] - if err := suite.db.DeleteNotificationsForStatus(context.Background(), testStatus.ID); err != nil { + if err := suite.db.DeleteNotificationsForStatus(suite.T().Context(), testStatus.ID); err != nil { suite.FailNow(err.Error()) } notif := []*gtsmodel.Notification{} - if err := suite.db.GetAll(context.Background(), ¬if); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), ¬if); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } diff --git a/internal/db/bundb/poll_test.go b/internal/db/bundb/poll_test.go index 04c8609e8..09a152c1d 100644 --- a/internal/db/bundb/poll_test.go +++ b/internal/db/bundb/poll_test.go @@ -39,7 +39,7 @@ func (suite *PollTestSuite) TestGetPollBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Sentinel error to mark avoiding a test case. @@ -103,7 +103,7 @@ func (suite *PollTestSuite) TestGetPollVoteBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Sentinel error to mark avoiding a test case. @@ -175,7 +175,7 @@ func (suite *PollTestSuite) TestGetPollVoteBy() { func (suite *PollTestSuite) TestUpdatePoll() { // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() for _, poll := range suite.testPolls { @@ -200,7 +200,7 @@ func (suite *PollTestSuite) TestUpdatePoll() { func (suite *PollTestSuite) TestPutPoll() { // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() for _, poll := range suite.testPolls { @@ -220,7 +220,7 @@ func (suite *PollTestSuite) TestPutPoll() { func (suite *PollTestSuite) TestPutPollVote() { // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // randomChoices generates random vote choices in poll. @@ -271,7 +271,7 @@ func (suite *PollTestSuite) TestPutPollVote() { func (suite *PollTestSuite) TestDeletePoll() { // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() for _, poll := range suite.testPolls { @@ -286,7 +286,7 @@ func (suite *PollTestSuite) TestDeletePoll() { } func (suite *PollTestSuite) TestDeletePollVotesBy() { - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() for _, vote := range suite.testPollVotes { @@ -308,7 +308,7 @@ func (suite *PollTestSuite) TestDeletePollVotesBy() { } func (suite *PollTestSuite) TestDeletePollVotesByNoAccount() { - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Try to delete a poll by nonexisting account. diff --git a/internal/db/bundb/relationship_test.go b/internal/db/bundb/relationship_test.go index 50f790a42..1d47db6a7 100644 --- a/internal/db/bundb/relationship_test.go +++ b/internal/db/bundb/relationship_test.go @@ -39,7 +39,7 @@ func (suite *RelationshipTestSuite) TestGetBlockBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Sentinel error to mark avoiding a test case. @@ -152,7 +152,7 @@ func (suite *RelationshipTestSuite) TestGetFollowBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Sentinel error to mark avoiding a test case. @@ -264,7 +264,7 @@ func (suite *RelationshipTestSuite) TestGetFollowRequestBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Sentinel error to mark avoiding a test case. @@ -374,7 +374,7 @@ func (suite *RelationshipTestSuite) TestGetFollowRequestBy() { } func (suite *RelationshipTestSuite) TestIsBlocked() { - ctx := context.Background() + ctx := suite.T().Context() account1 := suite.testAccounts["local_account_1"].ID account2 := suite.testAccounts["local_account_2"].ID @@ -418,7 +418,7 @@ func (suite *RelationshipTestSuite) TestIsBlocked() { } func (suite *RelationshipTestSuite) TestDeleteBlockByID() { - ctx := context.Background() + ctx := suite.T().Context() // put a block in first account1 := suite.testAccounts["local_account_1"].ID @@ -449,7 +449,7 @@ func (suite *RelationshipTestSuite) TestDeleteBlockByID() { } func (suite *RelationshipTestSuite) TestDeleteBlockByURI() { - ctx := context.Background() + ctx := suite.T().Context() // put a block in first account1 := suite.testAccounts["local_account_1"].ID @@ -480,7 +480,7 @@ func (suite *RelationshipTestSuite) TestDeleteBlockByURI() { } func (suite *RelationshipTestSuite) TestDeleteAccountBlocks() { - ctx := context.Background() + ctx := suite.T().Context() // put a block in first account1 := suite.testAccounts["local_account_1"].ID @@ -511,7 +511,7 @@ func (suite *RelationshipTestSuite) TestDeleteAccountBlocks() { } func (suite *RelationshipTestSuite) TestDeleteAccountMutes() { - ctx := context.Background() + ctx := suite.T().Context() // Add a mute. accountID1 := suite.testAccounts["local_account_1"].ID @@ -551,7 +551,7 @@ func (suite *RelationshipTestSuite) TestGetRelationship() { requestingAccount := suite.testAccounts["local_account_1"] targetAccount := suite.testAccounts["admin_account"] - relationship, err := suite.db.GetRelationship(context.Background(), requestingAccount.ID, targetAccount.ID) + relationship, err := suite.db.GetRelationship(suite.T().Context(), requestingAccount.ID, targetAccount.ID) suite.NoError(err) suite.NotNil(relationship) @@ -572,7 +572,7 @@ func (suite *RelationshipTestSuite) TestGetRelationship() { func (suite *RelationshipTestSuite) TestIsFollowingYes() { requestingAccount := suite.testAccounts["local_account_1"] targetAccount := suite.testAccounts["admin_account"] - isFollowing, err := suite.db.IsFollowing(context.Background(), requestingAccount.ID, targetAccount.ID) + isFollowing, err := suite.db.IsFollowing(suite.T().Context(), requestingAccount.ID, targetAccount.ID) suite.NoError(err) suite.True(isFollowing) } @@ -580,7 +580,7 @@ func (suite *RelationshipTestSuite) TestIsFollowingYes() { func (suite *RelationshipTestSuite) TestIsFollowingNo() { requestingAccount := suite.testAccounts["admin_account"] targetAccount := suite.testAccounts["local_account_2"] - isFollowing, err := suite.db.IsFollowing(context.Background(), requestingAccount.ID, targetAccount.ID) + isFollowing, err := suite.db.IsFollowing(suite.T().Context(), requestingAccount.ID, targetAccount.ID) suite.NoError(err) suite.False(isFollowing) } @@ -588,7 +588,7 @@ func (suite *RelationshipTestSuite) TestIsFollowingNo() { func (suite *RelationshipTestSuite) TestIsMutualFollowing() { requestingAccount := suite.testAccounts["local_account_1"] targetAccount := suite.testAccounts["admin_account"] - isMutualFollowing, err := suite.db.IsMutualFollowing(context.Background(), requestingAccount.ID, targetAccount.ID) + isMutualFollowing, err := suite.db.IsMutualFollowing(suite.T().Context(), requestingAccount.ID, targetAccount.ID) suite.NoError(err) suite.True(isMutualFollowing) } @@ -596,13 +596,13 @@ func (suite *RelationshipTestSuite) TestIsMutualFollowing() { func (suite *RelationshipTestSuite) TestIsMutualFollowingNo() { requestingAccount := suite.testAccounts["local_account_1"] targetAccount := suite.testAccounts["local_account_2"] - isMutualFollowing, err := suite.db.IsMutualFollowing(context.Background(), requestingAccount.ID, targetAccount.ID) + isMutualFollowing, err := suite.db.IsMutualFollowing(suite.T().Context(), requestingAccount.ID, targetAccount.ID) suite.NoError(err) suite.True(isMutualFollowing) } func (suite *RelationshipTestSuite) TestAcceptFollowRequestOK() { - ctx := context.Background() + ctx := suite.T().Context() account := suite.testAccounts["admin_account"] targetAccount := suite.testAccounts["local_account_2"] @@ -672,7 +672,7 @@ func (suite *RelationshipTestSuite) TestAcceptFollowRequestOK() { } func (suite *RelationshipTestSuite) TestAcceptFollowRequestNoNotification() { - ctx := context.Background() + ctx := suite.T().Context() account := suite.testAccounts["admin_account"] targetAccount := suite.testAccounts["local_account_2"] @@ -697,7 +697,7 @@ func (suite *RelationshipTestSuite) TestAcceptFollowRequestNoNotification() { } func (suite *RelationshipTestSuite) TestAcceptFollowRequestNotExisting() { - ctx := context.Background() + ctx := suite.T().Context() account := suite.testAccounts["admin_account"] targetAccount := suite.testAccounts["local_account_2"] @@ -707,7 +707,7 @@ func (suite *RelationshipTestSuite) TestAcceptFollowRequestNotExisting() { } func (suite *RelationshipTestSuite) TestAcceptFollowRequestFollowAlreadyExists() { - ctx := context.Background() + ctx := suite.T().Context() account := suite.testAccounts["local_account_1"] targetAccount := suite.testAccounts["admin_account"] @@ -738,7 +738,7 @@ func (suite *RelationshipTestSuite) TestAcceptFollowRequestFollowAlreadyExists() } func (suite *RelationshipTestSuite) TestRejectFollowRequestOK() { - ctx := context.Background() + ctx := suite.T().Context() account := suite.testAccounts["admin_account"] targetAccount := suite.testAccounts["local_account_2"] @@ -774,7 +774,7 @@ func (suite *RelationshipTestSuite) TestRejectFollowRequestOK() { } func (suite *RelationshipTestSuite) TestRejectFollowRequestNotExisting() { - ctx := context.Background() + ctx := suite.T().Context() account := suite.testAccounts["admin_account"] targetAccount := suite.testAccounts["local_account_2"] @@ -783,7 +783,7 @@ func (suite *RelationshipTestSuite) TestRejectFollowRequestNotExisting() { } func (suite *RelationshipTestSuite) TestGetAccountFollowRequests() { - ctx := context.Background() + ctx := suite.T().Context() account := suite.testAccounts["admin_account"] targetAccount := suite.testAccounts["local_account_2"] @@ -805,14 +805,14 @@ func (suite *RelationshipTestSuite) TestGetAccountFollowRequests() { func (suite *RelationshipTestSuite) TestGetAccountFollows() { account := suite.testAccounts["local_account_1"] - follows, err := suite.db.GetAccountFollows(context.Background(), account.ID, nil) + follows, err := suite.db.GetAccountFollows(suite.T().Context(), account.ID, nil) suite.NoError(err) suite.Len(follows, 2) } func (suite *RelationshipTestSuite) TestGetAccountFollowers() { account := suite.testAccounts["local_account_1"] - follows, err := suite.db.GetAccountFollowers(context.Background(), account.ID, nil) + follows, err := suite.db.GetAccountFollowers(suite.T().Context(), account.ID, nil) suite.NoError(err) suite.Len(follows, 2) } @@ -821,25 +821,25 @@ func (suite *RelationshipTestSuite) TestUnfollowExisting() { originAccount := suite.testAccounts["local_account_1"] targetAccount := suite.testAccounts["admin_account"] - follow, err := suite.db.GetFollow(context.Background(), originAccount.ID, targetAccount.ID) + follow, err := suite.db.GetFollow(suite.T().Context(), originAccount.ID, targetAccount.ID) suite.NoError(err) suite.NotNil(follow) followID := follow.ID // We should have lists that this follow is a part of. - lists, err := suite.db.GetListsContainingFollowID(context.Background(), followID) + lists, err := suite.db.GetListsContainingFollowID(suite.T().Context(), followID) suite.NoError(err) suite.NotEmpty(lists) - err = suite.db.DeleteFollowByID(context.Background(), followID) + err = suite.db.DeleteFollowByID(suite.T().Context(), followID) suite.NoError(err) - follow, err = suite.db.GetFollow(context.Background(), originAccount.ID, targetAccount.ID) + follow, err = suite.db.GetFollow(suite.T().Context(), originAccount.ID, targetAccount.ID) suite.EqualError(err, db.ErrNoEntries.Error()) suite.Nil(follow) // Lists containing this follow should return empty too. - lists, err = suite.db.GetListsContainingFollowID(context.Background(), followID) + lists, err = suite.db.GetListsContainingFollowID(suite.T().Context(), followID) suite.NoError(err) suite.Empty(lists) } @@ -848,13 +848,13 @@ func (suite *RelationshipTestSuite) TestGetFollowNotExisting() { originAccount := suite.testAccounts["local_account_1"] targetAccountID := "01GTVD9N484CZ6AM90PGGNY7GQ" - follow, err := suite.db.GetFollow(context.Background(), originAccount.ID, targetAccountID) + follow, err := suite.db.GetFollow(suite.T().Context(), originAccount.ID, targetAccountID) suite.EqualError(err, db.ErrNoEntries.Error()) suite.Nil(follow) } func (suite *RelationshipTestSuite) TestDeleteFollow() { - ctx := context.Background() + ctx := suite.T().Context() originAccount := suite.testAccounts["local_account_1"] targetAccount := suite.testAccounts["admin_account"] @@ -867,7 +867,7 @@ func (suite *RelationshipTestSuite) TestDeleteFollow() { } func (suite *RelationshipTestSuite) TestUnfollowRequestExisting() { - ctx := context.Background() + ctx := suite.T().Context() originAccount := suite.testAccounts["admin_account"] targetAccount := suite.testAccounts["local_account_2"] @@ -882,14 +882,14 @@ func (suite *RelationshipTestSuite) TestUnfollowRequestExisting() { suite.FailNow(err.Error()) } - followRequest, err := suite.db.GetFollowRequest(context.Background(), originAccount.ID, targetAccount.ID) + followRequest, err := suite.db.GetFollowRequest(suite.T().Context(), originAccount.ID, targetAccount.ID) suite.NoError(err) suite.NotNil(followRequest) - err = suite.db.DeleteFollowRequestByID(context.Background(), followRequest.ID) + err = suite.db.DeleteFollowRequestByID(suite.T().Context(), followRequest.ID) suite.NoError(err) - followRequest, err = suite.db.GetFollowRequest(context.Background(), originAccount.ID, targetAccount.ID) + followRequest, err = suite.db.GetFollowRequest(suite.T().Context(), originAccount.ID, targetAccount.ID) suite.EqualError(err, db.ErrNoEntries.Error()) suite.Nil(followRequest) } @@ -898,13 +898,13 @@ func (suite *RelationshipTestSuite) TestUnfollowRequestNotExisting() { originAccount := suite.testAccounts["local_account_1"] targetAccountID := "01GTVD9N484CZ6AM90PGGNY7GQ" - followRequest, err := suite.db.GetFollowRequest(context.Background(), originAccount.ID, targetAccountID) + followRequest, err := suite.db.GetFollowRequest(suite.T().Context(), originAccount.ID, targetAccountID) suite.EqualError(err, db.ErrNoEntries.Error()) suite.Nil(followRequest) } func (suite *RelationshipTestSuite) TestUpdateFollow() { - ctx := context.Background() + ctx := suite.T().Context() follow := >smodel.Follow{} *follow = *suite.testFollows["local_account_1_admin_account"] @@ -930,7 +930,7 @@ func (suite *RelationshipTestSuite) TestUpdateFollow() { } func (suite *RelationshipTestSuite) TestGetNote() { - ctx := context.Background() + ctx := suite.T().Context() // Retrieve a fixture note account1 := suite.testAccounts["local_account_1"].ID @@ -944,7 +944,7 @@ func (suite *RelationshipTestSuite) TestGetNote() { } func (suite *RelationshipTestSuite) TestPutNote() { - ctx := context.Background() + ctx := suite.T().Context() // put a note in account1 := suite.testAccounts["local_account_1"].ID diff --git a/internal/db/bundb/report_test.go b/internal/db/bundb/report_test.go index 910a5c370..ec90f783f 100644 --- a/internal/db/bundb/report_test.go +++ b/internal/db/bundb/report_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/db" @@ -35,7 +34,7 @@ type ReportTestSuite struct { } func (suite *ReportTestSuite) TestGetReportByID() { - report, err := suite.db.GetReportByID(context.Background(), suite.testReports["local_account_2_report_remote_account_1"].ID) + report, err := suite.db.GetReportByID(suite.T().Context(), suite.testReports["local_account_2_report_remote_account_1"].ID) if err != nil { suite.FailNow(err.Error()) } @@ -49,7 +48,7 @@ func (suite *ReportTestSuite) TestGetReportByID() { } func (suite *ReportTestSuite) TestGetReportByURI() { - report, err := suite.db.GetReportByID(context.Background(), suite.testReports["remote_account_1_report_local_account_2"].ID) + report, err := suite.db.GetReportByID(suite.T().Context(), suite.testReports["remote_account_1_report_local_account_2"].ID) if err != nil { suite.FailNow(err.Error()) } @@ -64,7 +63,7 @@ func (suite *ReportTestSuite) TestGetReportByURI() { func (suite *ReportTestSuite) TestGetAllReports() { reports, err := suite.db.GetReports( - context.Background(), + suite.T().Context(), nil, "", "", @@ -77,7 +76,7 @@ func (suite *ReportTestSuite) TestGetAllReports() { func (suite *ReportTestSuite) TestReportPagingDown() { // Get one from the top. reports1, err := suite.db.GetReports( - context.Background(), + suite.T().Context(), nil, "", "", @@ -95,7 +94,7 @@ func (suite *ReportTestSuite) TestReportPagingDown() { // Use this one to page down. reports2, err := suite.db.GetReports( - context.Background(), + suite.T().Context(), nil, "", "", @@ -118,7 +117,7 @@ func (suite *ReportTestSuite) TestReportPagingDown() { func (suite *ReportTestSuite) TestReportPagingUp() { // Get one from the bottom. reports1, err := suite.db.GetReports( - context.Background(), + suite.T().Context(), nil, "", "", @@ -137,7 +136,7 @@ func (suite *ReportTestSuite) TestReportPagingUp() { // Use this one to page up. reports2, err := suite.db.GetReports( - context.Background(), + suite.T().Context(), nil, "", "", @@ -160,7 +159,7 @@ func (suite *ReportTestSuite) TestReportPagingUp() { func (suite *ReportTestSuite) TestGetAllReportsByAccountID() { accountID := suite.testAccounts["local_account_2"].ID reports, err := suite.db.GetReports( - context.Background(), + suite.T().Context(), nil, accountID, "", @@ -174,7 +173,7 @@ func (suite *ReportTestSuite) TestGetAllReportsByAccountID() { } func (suite *ReportTestSuite) TestPutReport() { - ctx := context.Background() + ctx := suite.T().Context() reportID := "01GP3ECY8QJD8DBJSS8B1CR0AX" report := >smodel.Report{ @@ -194,7 +193,7 @@ func (suite *ReportTestSuite) TestPutReport() { } func (suite *ReportTestSuite) TestUpdateReport() { - ctx := context.Background() + ctx := suite.T().Context() report := >smodel.Report{} *report = *suite.testReports["local_account_2_report_remote_account_1"] @@ -220,7 +219,7 @@ func (suite *ReportTestSuite) TestUpdateReport() { } func (suite *ReportTestSuite) TestUpdateReportAllColumns() { - ctx := context.Background() + ctx := suite.T().Context() report := >smodel.Report{} *report = *suite.testReports["local_account_2_report_remote_account_1"] @@ -246,11 +245,11 @@ func (suite *ReportTestSuite) TestUpdateReportAllColumns() { } func (suite *ReportTestSuite) TestDeleteReport() { - if err := suite.db.DeleteReportByID(context.Background(), suite.testReports["remote_account_1_report_local_account_2"].ID); err != nil { + if err := suite.db.DeleteReportByID(suite.T().Context(), suite.testReports["remote_account_1_report_local_account_2"].ID); err != nil { suite.FailNow(err.Error()) } - report, err := suite.db.GetReportByID(context.Background(), suite.testReports["remote_account_1_report_local_account_2"].ID) + report, err := suite.db.GetReportByID(suite.T().Context(), suite.testReports["remote_account_1_report_local_account_2"].ID) suite.ErrorIs(err, db.ErrNoEntries) suite.Nil(report) } 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()) } diff --git a/internal/db/bundb/search_test.go b/internal/db/bundb/search_test.go index 5ce1a6064..c864f6da2 100644 --- a/internal/db/bundb/search_test.go +++ b/internal/db/bundb/search_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/db" @@ -32,7 +31,7 @@ type SearchTestSuite struct { func (suite *SearchTestSuite) TestSearchAccountsTurtleAny() { testAccount := suite.testAccounts["local_account_1"] - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "turtle", "", "", 10, false, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "turtle", "", "", 10, false, 0) suite.NoError(err) suite.Len(accounts, 1) } @@ -41,7 +40,7 @@ func (suite *SearchTestSuite) TestSearchAccounts1HappyWithPrefix() { testAccount := suite.testAccounts["local_account_1"] // Query will just look for usernames that start with "1happy". - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "@1happy", "", "", 10, false, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "@1happy", "", "", 10, false, 0) suite.NoError(err) suite.Len(accounts, 1) } @@ -50,7 +49,7 @@ func (suite *SearchTestSuite) TestSearchAccounts1HappyWithPrefixUpper() { testAccount := suite.testAccounts["local_account_1"] // Query will just look for usernames that start with "1HAPPY". - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "@1HAPPY", "", "", 10, false, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "@1HAPPY", "", "", 10, false, 0) suite.NoError(err) suite.Len(accounts, 1) } @@ -59,7 +58,7 @@ func (suite *SearchTestSuite) TestSearchAccounts1HappyNoPrefix() { testAccount := suite.testAccounts["local_account_1"] // Query will do the full coalesce. - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "1happy", "", "", 10, false, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "1happy", "", "", 10, false, 0) suite.NoError(err) suite.Len(accounts, 1) } @@ -67,7 +66,7 @@ func (suite *SearchTestSuite) TestSearchAccounts1HappyNoPrefix() { func (suite *SearchTestSuite) TestSearchAccountsTurtleFollowing() { testAccount := suite.testAccounts["local_account_1"] - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "turtle", "", "", 10, true, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "turtle", "", "", 10, true, 0) suite.NoError(err) suite.Len(accounts, 1) } @@ -75,7 +74,7 @@ func (suite *SearchTestSuite) TestSearchAccountsTurtleFollowing() { func (suite *SearchTestSuite) TestSearchAccountsTurtleFollowingUpper() { testAccount := suite.testAccounts["local_account_1"] - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "TURTLE", "", "", 10, true, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "TURTLE", "", "", 10, true, 0) suite.NoError(err) suite.Len(accounts, 1) } @@ -83,7 +82,7 @@ func (suite *SearchTestSuite) TestSearchAccountsTurtleFollowingUpper() { func (suite *SearchTestSuite) TestSearchAccountsPostFollowing() { testAccount := suite.testAccounts["local_account_1"] - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "post", "", "", 10, true, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "post", "", "", 10, true, 0) suite.NoError(err) suite.Len(accounts, 1) } @@ -91,7 +90,7 @@ func (suite *SearchTestSuite) TestSearchAccountsPostFollowing() { func (suite *SearchTestSuite) TestSearchAccountsPostAny() { testAccount := suite.testAccounts["local_account_1"] - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "post", "", "", 10, false, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "post", "", "", 10, false, 0) suite.NoError(err, db.ErrNoEntries) suite.Empty(accounts) } @@ -99,7 +98,7 @@ func (suite *SearchTestSuite) TestSearchAccountsPostAny() { func (suite *SearchTestSuite) TestSearchAccountsFossAny() { testAccount := suite.testAccounts["local_account_1"] - accounts, err := suite.db.SearchForAccounts(context.Background(), testAccount.ID, "foss", "", "", 10, false, 0) + accounts, err := suite.db.SearchForAccounts(suite.T().Context(), testAccount.ID, "foss", "", "", 10, false, 0) suite.NoError(err) suite.Len(accounts, 1) } @@ -107,7 +106,7 @@ func (suite *SearchTestSuite) TestSearchAccountsFossAny() { func (suite *SearchTestSuite) TestSearchStatuses() { testAccount := suite.testAccounts["local_account_1"] - statuses, err := suite.db.SearchForStatuses(context.Background(), testAccount.ID, "hello", "", "", "", 10, 0) + statuses, err := suite.db.SearchForStatuses(suite.T().Context(), testAccount.ID, "hello", "", "", "", 10, 0) suite.NoError(err) suite.Len(statuses, 1) } @@ -116,7 +115,7 @@ func (suite *SearchTestSuite) TestSearchStatusesFromAccount() { testAccount := suite.testAccounts["local_account_1"] fromAccount := suite.testAccounts["local_account_2"] - statuses, err := suite.db.SearchForStatuses(context.Background(), testAccount.ID, "hi", fromAccount.ID, "", "", 10, 0) + statuses, err := suite.db.SearchForStatuses(suite.T().Context(), testAccount.ID, "hi", fromAccount.ID, "", "", 10, 0) suite.NoError(err) if suite.Len(statuses, 1) { suite.Equal(fromAccount.ID, statuses[0].AccountID) @@ -125,17 +124,17 @@ func (suite *SearchTestSuite) TestSearchStatusesFromAccount() { func (suite *SearchTestSuite) TestSearchTags() { // Search with full tag string. - tags, err := suite.db.SearchForTags(context.Background(), "welcome", "", "", 10, 0) + tags, err := suite.db.SearchForTags(suite.T().Context(), "welcome", "", "", 10, 0) suite.NoError(err) suite.Len(tags, 1) // Search with partial tag string. - tags, err = suite.db.SearchForTags(context.Background(), "wel", "", "", 10, 0) + tags, err = suite.db.SearchForTags(suite.T().Context(), "wel", "", "", 10, 0) suite.NoError(err) suite.Len(tags, 1) // Search with end of tag string. - tags, err = suite.db.SearchForTags(context.Background(), "come", "", "", 10, 0) + tags, err = suite.db.SearchForTags(suite.T().Context(), "come", "", "", 10, 0) suite.NoError(err) suite.Len(tags, 0) } diff --git a/internal/db/bundb/session_test.go b/internal/db/bundb/session_test.go index 43921cacc..0c1199e84 100644 --- a/internal/db/bundb/session_test.go +++ b/internal/db/bundb/session_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "github.com/stretchr/testify/suite" @@ -29,7 +28,7 @@ type SessionTestSuite struct { } func (suite *SessionTestSuite) TestGetSession() { - session, err := suite.db.GetSession(context.Background()) + session, err := suite.db.GetSession(suite.T().Context()) suite.NoError(err) suite.NotNil(session) suite.NotEmpty(session.Auth) @@ -37,7 +36,7 @@ func (suite *SessionTestSuite) TestGetSession() { suite.NotEmpty(session.ID) // the same session should be returned with consecutive selects - session2, err := suite.db.GetSession(context.Background()) + session2, err := suite.db.GetSession(suite.T().Context()) suite.NoError(err) suite.NotNil(session2) suite.Equal(session.Auth, session2.Auth) diff --git a/internal/db/bundb/status_test.go b/internal/db/bundb/status_test.go index 3ee494213..9c1eb73bd 100644 --- a/internal/db/bundb/status_test.go +++ b/internal/db/bundb/status_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "time" @@ -32,7 +31,7 @@ type StatusTestSuite struct { } func (suite *StatusTestSuite) TestGetStatusByID() { - status, err := suite.db.GetStatusByID(context.Background(), suite.testStatuses["local_account_1_status_1"].ID) + status, err := suite.db.GetStatusByID(suite.T().Context(), suite.testStatuses["local_account_1_status_1"].ID) if err != nil { suite.FailNow(err.Error()) } @@ -52,7 +51,7 @@ func (suite *StatusTestSuite) TestGetStatusesByIDs() { suite.testStatuses["local_account_2_status_3"].ID, } - statuses, err := suite.db.GetStatusesByIDs(context.Background(), ids) + statuses, err := suite.db.GetStatusesByIDs(suite.T().Context(), ids) if err != nil { suite.FailNow(err.Error()) } @@ -83,7 +82,7 @@ func (suite *StatusTestSuite) TestGetStatusesByIDs() { } func (suite *StatusTestSuite) TestGetStatusByURI() { - status, err := suite.db.GetStatusByURI(context.Background(), suite.testStatuses["local_account_2_status_3"].URI) + status, err := suite.db.GetStatusByURI(suite.T().Context(), suite.testStatuses["local_account_2_status_3"].URI) if err != nil { suite.FailNow(err.Error()) } @@ -98,7 +97,7 @@ func (suite *StatusTestSuite) TestGetStatusByURI() { } func (suite *StatusTestSuite) TestGetStatusWithExtras() { - status, err := suite.db.GetStatusByID(context.Background(), suite.testStatuses["admin_account_status_1"].ID) + status, err := suite.db.GetStatusByID(suite.T().Context(), suite.testStatuses["admin_account_status_1"].ID) if err != nil { suite.FailNow(err.Error()) } @@ -112,7 +111,7 @@ func (suite *StatusTestSuite) TestGetStatusWithExtras() { } func (suite *StatusTestSuite) TestGetStatusWithMention() { - status, err := suite.db.GetStatusByID(context.Background(), suite.testStatuses["local_account_2_status_5"].ID) + status, err := suite.db.GetStatusByID(suite.T().Context(), suite.testStatuses["local_account_2_status_5"].ID) if err != nil { suite.FailNow(err.Error()) } @@ -135,14 +134,14 @@ func (suite *StatusTestSuite) TestGetStatusWithMention() { /* func (suite *StatusTestSuite) TestGetStatusTwice() { before1 := time.Now() - _, err := suite.db.GetStatusByURI(context.Background(), suite.testStatuses["local_account_1_status_1"].URI) + _, err := suite.db.GetStatusByURI(suite.T().Context(), suite.testStatuses["local_account_1_status_1"].URI) suite.NoError(err) after1 := time.Now() duration1 := after1.Sub(before1) fmt.Println(duration1.Microseconds()) before2 := time.Now() - _, err = suite.db.GetStatusByURI(context.Background(), suite.testStatuses["local_account_1_status_1"].URI) + _, err = suite.db.GetStatusByURI(suite.T().Context(), suite.testStatuses["local_account_1_status_1"].URI) suite.NoError(err) after2 := time.Now() duration2 := after2.Sub(before2) @@ -155,7 +154,7 @@ func (suite *StatusTestSuite) TestGetStatusTwice() { func (suite *StatusTestSuite) TestGetStatusReplies() { targetStatus := suite.testStatuses["local_account_1_status_1"] - children, err := suite.db.GetStatusReplies(context.Background(), targetStatus.ID) + children, err := suite.db.GetStatusReplies(suite.T().Context(), targetStatus.ID) suite.NoError(err) suite.Len(children, 2) for _, c := range children { @@ -167,7 +166,7 @@ func (suite *StatusTestSuite) TestGetStatusReplies() { func (suite *StatusTestSuite) TestGetStatusChildren() { targetStatus := suite.testStatuses["local_account_1_status_1"] - children, err := suite.db.GetStatusChildren(context.Background(), targetStatus.ID) + children, err := suite.db.GetStatusChildren(suite.T().Context(), targetStatus.ID) suite.NoError(err) suite.Len(children, 3) } @@ -177,10 +176,10 @@ func (suite *StatusTestSuite) TestDeleteStatus() { targetStatus := >smodel.Status{} *targetStatus = *suite.testStatuses["admin_account_status_1"] - err := suite.db.DeleteStatusByID(context.Background(), targetStatus.ID) + err := suite.db.DeleteStatusByID(suite.T().Context(), targetStatus.ID) suite.NoError(err) - _, err = suite.db.GetStatusByID(context.Background(), targetStatus.ID) + _, err = suite.db.GetStatusByID(suite.T().Context(), targetStatus.ID) suite.ErrorIs(err, db.ErrNoEntries) } @@ -201,16 +200,16 @@ func (suite *StatusTestSuite) TestUpdateStatus() { targetStatus.PinnedAt = time.Time{} - err := suite.db.UpdateStatus(context.Background(), targetStatus, "pinned_at") + err := suite.db.UpdateStatus(suite.T().Context(), targetStatus, "pinned_at") suite.NoError(err) - updated, err := suite.db.GetStatusByID(context.Background(), targetStatus.ID) + updated, err := suite.db.GetStatusByID(suite.T().Context(), targetStatus.ID) suite.NoError(err) suite.True(updated.PinnedAt.IsZero()) } func (suite *StatusTestSuite) TestPutPopulatedStatus() { - ctx := context.Background() + ctx := suite.T().Context() targetStatus := >smodel.Status{} *targetStatus = *suite.testStatuses["admin_account_status_1"] diff --git a/internal/db/bundb/statusbookmark_test.go b/internal/db/bundb/statusbookmark_test.go index c2977fdfb..51d4d4d20 100644 --- a/internal/db/bundb/statusbookmark_test.go +++ b/internal/db/bundb/statusbookmark_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "errors" "testing" @@ -33,7 +32,7 @@ type StatusBookmarkTestSuite struct { func (suite *StatusBookmarkTestSuite) TestGetStatusBookmarkOK() { testBookmark := suite.testBookmarks["local_account_1_admin_account_status_1"] - bookmark, err := suite.db.GetStatusBookmark(context.Background(), testBookmark.AccountID, testBookmark.StatusID) + bookmark, err := suite.db.GetStatusBookmark(suite.T().Context(), testBookmark.AccountID, testBookmark.StatusID) suite.NoError(err) suite.Equal(testBookmark.ID, bookmark.ID) suite.Equal(testBookmark.AccountID, bookmark.AccountID) @@ -41,7 +40,7 @@ func (suite *StatusBookmarkTestSuite) TestGetStatusBookmarkOK() { } func (suite *StatusBookmarkTestSuite) TestGetStatusBookmarkNonexisting() { - bookmark, err := suite.db.GetStatusBookmark(context.Background(), "01GVAVGD06YJ2FSB5GJSMF8M2K", "01GVAVGKGR1MK9ZN7JCJFYSFZV") + bookmark, err := suite.db.GetStatusBookmark(suite.T().Context(), "01GVAVGD06YJ2FSB5GJSMF8M2K", "01GVAVGKGR1MK9ZN7JCJFYSFZV") suite.Nil(bookmark) suite.ErrorIs(err, db.ErrNoEntries) } @@ -49,7 +48,7 @@ func (suite *StatusBookmarkTestSuite) TestGetStatusBookmarkNonexisting() { func (suite *StatusBookmarkTestSuite) IsStatusBookmarked() { for _, bookmark := range suite.testBookmarks { ok, err := suite.db.IsStatusBookmarked( - context.Background(), + suite.T().Context(), bookmark.StatusID, ) suite.NoError(err) @@ -60,12 +59,12 @@ func (suite *StatusBookmarkTestSuite) IsStatusBookmarked() { func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksOriginatingFromAccount() { testAccount := suite.testAccounts["local_account_1"] - if err := suite.db.DeleteStatusBookmarks(context.Background(), "", testAccount.ID); err != nil { + if err := suite.db.DeleteStatusBookmarks(suite.T().Context(), "", testAccount.ID); err != nil { suite.FailNow(err.Error()) } bookmarks := []*gtsmodel.StatusBookmark{} - if err := suite.db.GetAll(context.Background(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } @@ -79,12 +78,12 @@ func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksOriginatingFromAc func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksTargetingAccount() { testAccount := suite.testAccounts["local_account_1"] - if err := suite.db.DeleteStatusBookmarks(context.Background(), testAccount.ID, ""); err != nil { + if err := suite.db.DeleteStatusBookmarks(suite.T().Context(), testAccount.ID, ""); err != nil { suite.FailNow(err.Error()) } bookmarks := []*gtsmodel.StatusBookmark{} - if err := suite.db.GetAll(context.Background(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } @@ -98,12 +97,12 @@ func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksTargetingAccount( func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksTargetingStatus() { testStatus := suite.testStatuses["local_account_1_status_1"] - if err := suite.db.DeleteStatusBookmarksForStatus(context.Background(), testStatus.ID); err != nil { + if err := suite.db.DeleteStatusBookmarksForStatus(suite.T().Context(), testStatus.ID); err != nil { suite.FailNow(err.Error()) } bookmarks := []*gtsmodel.StatusBookmark{} - if err := suite.db.GetAll(context.Background(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } @@ -116,7 +115,7 @@ func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksTargetingStatus() func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarkByID() { testBookmark := suite.testBookmarks["local_account_1_admin_account_status_1"] - ctx := context.Background() + ctx := suite.T().Context() if err := suite.db.DeleteStatusBookmarkByID(ctx, testBookmark.ID); err != nil { suite.FailNow(err.Error()) @@ -128,7 +127,7 @@ func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarkByID() { } func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarkByIDNonExisting() { - err := suite.db.DeleteStatusBookmarkByID(context.Background(), "01GVAV715K6Y2SG9ZKS9ZA8G7G") + err := suite.db.DeleteStatusBookmarkByID(suite.T().Context(), "01GVAV715K6Y2SG9ZKS9ZA8G7G") suite.NoError(err) } diff --git a/internal/db/bundb/statusedit_test.go b/internal/db/bundb/statusedit_test.go index 639e5ba9b..bb23ecc83 100644 --- a/internal/db/bundb/statusedit_test.go +++ b/internal/db/bundb/statusedit_test.go @@ -37,7 +37,7 @@ func (suite *StatusEditTestSuite) TestGetStatusEditBy() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // Sentinel error to mark avoiding a test case. @@ -78,7 +78,7 @@ func (suite *StatusEditTestSuite) TestGetStatusEditsByIDs() { t := suite.T() // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() // editsByStatus returns all test edits by the given status with ID. @@ -115,7 +115,7 @@ func (suite *StatusEditTestSuite) TestGetStatusEditsByIDs() { func (suite *StatusEditTestSuite) TestDeleteStatusEdits() { // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) + ctx, cncl := context.WithCancel(suite.T().Context()) defer cncl() for _, status := range suite.testStatuses { diff --git a/internal/db/bundb/statusfave_test.go b/internal/db/bundb/statusfave_test.go index 88f10e146..b31cc4640 100644 --- a/internal/db/bundb/statusfave_test.go +++ b/internal/db/bundb/statusfave_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "errors" "testing" @@ -34,7 +33,7 @@ type StatusFaveTestSuite struct { func (suite *StatusFaveTestSuite) TestGetStatusFaves() { testStatus := suite.testStatuses["admin_account_status_1"] - faves, err := suite.db.GetStatusFaves(context.Background(), testStatus.ID) + faves, err := suite.db.GetStatusFaves(suite.T().Context(), testStatus.ID) if err != nil { suite.FailNow(err.Error()) } @@ -50,7 +49,7 @@ func (suite *StatusFaveTestSuite) TestGetStatusFaves() { func (suite *StatusFaveTestSuite) TestGetStatusFavesNone() { testStatus := suite.testStatuses["admin_account_status_4"] - faves, err := suite.db.GetStatusFaves(context.Background(), testStatus.ID) + faves, err := suite.db.GetStatusFaves(suite.T().Context(), testStatus.ID) if err != nil { suite.FailNow(err.Error()) } @@ -62,7 +61,7 @@ func (suite *StatusFaveTestSuite) TestGetStatusFaveByAccountID() { testAccount := suite.testAccounts["local_account_1"] testStatus := suite.testStatuses["admin_account_status_1"] - fave, err := suite.db.GetStatusFave(context.Background(), testAccount.ID, testStatus.ID) + fave, err := suite.db.GetStatusFave(suite.T().Context(), testAccount.ID, testStatus.ID) suite.NoError(err) suite.NotNil(fave) } @@ -70,12 +69,12 @@ func (suite *StatusFaveTestSuite) TestGetStatusFaveByAccountID() { func (suite *StatusFaveTestSuite) TestDeleteStatusFavesOriginatingFromAccount() { testAccount := suite.testAccounts["local_account_1"] - if err := suite.db.DeleteStatusFaves(context.Background(), "", testAccount.ID); err != nil { + if err := suite.db.DeleteStatusFaves(suite.T().Context(), "", testAccount.ID); err != nil { suite.FailNow(err.Error()) } faves := []*gtsmodel.StatusFave{} - if err := suite.db.GetAll(context.Background(), &faves); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), &faves); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } @@ -89,12 +88,12 @@ func (suite *StatusFaveTestSuite) TestDeleteStatusFavesOriginatingFromAccount() func (suite *StatusFaveTestSuite) TestDeleteStatusFavesTargetingAccount() { testAccount := suite.testAccounts["local_account_1"] - if err := suite.db.DeleteStatusFaves(context.Background(), testAccount.ID, ""); err != nil { + if err := suite.db.DeleteStatusFaves(suite.T().Context(), testAccount.ID, ""); err != nil { suite.FailNow(err.Error()) } faves := []*gtsmodel.StatusFave{} - if err := suite.db.GetAll(context.Background(), &faves); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), &faves); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } @@ -108,12 +107,12 @@ func (suite *StatusFaveTestSuite) TestDeleteStatusFavesTargetingAccount() { func (suite *StatusFaveTestSuite) TestDeleteStatusFavesTargetingStatus() { testStatus := suite.testStatuses["local_account_1_status_1"] - if err := suite.db.DeleteStatusFavesForStatus(context.Background(), testStatus.ID); err != nil { + if err := suite.db.DeleteStatusFavesForStatus(suite.T().Context(), testStatus.ID); err != nil { suite.FailNow(err.Error()) } faves := []*gtsmodel.StatusFave{} - if err := suite.db.GetAll(context.Background(), &faves); err != nil && !errors.Is(err, db.ErrNoEntries) { + if err := suite.db.GetAll(suite.T().Context(), &faves); err != nil && !errors.Is(err, db.ErrNoEntries) { suite.FailNow(err.Error()) } @@ -126,7 +125,7 @@ func (suite *StatusFaveTestSuite) TestDeleteStatusFavesTargetingStatus() { func (suite *StatusFaveTestSuite) TestDeleteStatusFave() { testFave := suite.testFaves["local_account_1_admin_account_status_1"] - ctx := context.Background() + ctx := suite.T().Context() if err := suite.db.DeleteStatusFaveByID(ctx, testFave.ID); err != nil { suite.FailNow(err.Error()) @@ -138,7 +137,7 @@ func (suite *StatusFaveTestSuite) TestDeleteStatusFave() { } func (suite *StatusFaveTestSuite) TestDeleteStatusFaveNonExisting() { - err := suite.db.DeleteStatusFaveByID(context.Background(), "01GVAV715K6Y2SG9ZKS9ZA8G7G") + err := suite.db.DeleteStatusFaveByID(suite.T().Context(), "01GVAV715K6Y2SG9ZKS9ZA8G7G") suite.NoError(err) } diff --git a/internal/db/bundb/tag_test.go b/internal/db/bundb/tag_test.go index 62d6e8543..f6da8bb6b 100644 --- a/internal/db/bundb/tag_test.go +++ b/internal/db/bundb/tag_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "errors" "testing" @@ -35,7 +34,7 @@ type TagTestSuite struct { func (suite *TagTestSuite) TestGetTag() { testTag := suite.testTags["welcome"] - dbTag, err := suite.db.GetTag(context.Background(), testTag.ID) + dbTag, err := suite.db.GetTag(suite.T().Context(), testTag.ID) suite.NoError(err) suite.NotNil(dbTag) suite.Equal(testTag.ID, dbTag.ID) @@ -53,7 +52,7 @@ func (suite *TagTestSuite) TestGetTagByName() { "Welcome", "WELCoME ", } { - dbTag, err := suite.db.GetTagByName(context.Background(), name) + dbTag, err := suite.db.GetTagByName(suite.T().Context(), name) suite.NoError(err) suite.NotNil(dbTag) suite.Equal(testTag.ID, dbTag.ID) @@ -70,7 +69,7 @@ func (suite *TagTestSuite) TestPutTag() { "NEWtag", "NEWTAG ", } { - err := suite.db.PutTag(context.Background(), >smodel.Tag{ + err := suite.db.PutTag(suite.T().Context(), >smodel.Tag{ ID: id.NewULID(), Name: name, }) diff --git a/internal/db/bundb/thread_test.go b/internal/db/bundb/thread_test.go index d8b8d0b3b..0d34b6450 100644 --- a/internal/db/bundb/thread_test.go +++ b/internal/db/bundb/thread_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" @@ -32,7 +31,7 @@ type ThreadTestSuite struct { func (suite *ThreadTestSuite) TestPutThread() { suite.NoError( suite.db.PutThread( - context.Background(), + suite.T().Context(), >smodel.Thread{ ID: "01HCWK4HVQ4VGSS1G4VQP3AXZF", }, @@ -44,7 +43,7 @@ func (suite *ThreadTestSuite) TestMuteUnmuteThread() { var ( threadID = suite.testThreads["local_account_1_status_1"].ID accountID = suite.testAccounts["local_account_1"].ID - ctx = context.Background() + ctx = suite.T().Context() threadMute = >smodel.ThreadMute{ ID: "01HD3K14B62YJHH4RR0DSZ1EQ2", ThreadID: threadID, diff --git a/internal/db/bundb/timeline_test.go b/internal/db/bundb/timeline_test.go index 8f3bbe23e..3d3f06252 100644 --- a/internal/db/bundb/timeline_test.go +++ b/internal/db/bundb/timeline_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/gtscontext" @@ -110,7 +109,7 @@ func (suite *TimelineTestSuite) checkStatuses(statuses []*gtsmodel.Status, maxID } func (suite *TimelineTestSuite) TestGetPublicTimeline() { - ctx := context.Background() + ctx := suite.T().Context() page := toPage("", "", "", 20) @@ -123,7 +122,7 @@ func (suite *TimelineTestSuite) TestGetPublicTimeline() { } func (suite *TimelineTestSuite) TestGetPublicTimelineLocal() { - ctx := context.Background() + ctx := suite.T().Context() page := toPage("", "", "", 20) @@ -137,7 +136,7 @@ func (suite *TimelineTestSuite) TestGetPublicTimelineLocal() { func (suite *TimelineTestSuite) TestGetHomeTimeline() { var ( - ctx = context.Background() + ctx = suite.T().Context() viewingAccount = suite.testAccounts["local_account_1"] ) @@ -153,7 +152,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimeline() { func (suite *TimelineTestSuite) TestGetHomeTimelineIgnoreExclusive() { var ( - ctx = context.Background() + ctx = suite.T().Context() viewingAccount = suite.testAccounts["local_account_1"] ) @@ -195,7 +194,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineIgnoreExclusive() { func (suite *TimelineTestSuite) TestGetHomeTimelineNoFollowing() { var ( - ctx = context.Background() + ctx = suite.T().Context() viewingAccount = suite.testAccounts["local_account_1"] ) @@ -229,7 +228,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineNoFollowing() { func (suite *TimelineTestSuite) TestGetHomeTimelineBackToFront() { var ( - ctx = context.Background() + ctx = suite.T().Context() viewingAccount = suite.testAccounts["local_account_1"] ) @@ -247,7 +246,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineBackToFront() { func (suite *TimelineTestSuite) TestGetHomeTimelineFromHighest() { var ( - ctx = context.Background() + ctx = suite.T().Context() viewingAccount = suite.testAccounts["local_account_1"] ) @@ -265,7 +264,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineFromHighest() { func (suite *TimelineTestSuite) TestGetListTimelineNoParams() { var ( - ctx = context.Background() + ctx = suite.T().Context() list = suite.testLists["local_account_1_list_1"] ) @@ -281,7 +280,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineNoParams() { func (suite *TimelineTestSuite) TestGetListTimelineMaxID() { var ( - ctx = context.Background() + ctx = suite.T().Context() list = suite.testLists["local_account_1_list_1"] ) @@ -299,7 +298,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineMaxID() { func (suite *TimelineTestSuite) TestGetListTimelineMinID() { var ( - ctx = context.Background() + ctx = suite.T().Context() list = suite.testLists["local_account_1_list_1"] ) @@ -317,7 +316,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineMinID() { func (suite *TimelineTestSuite) TestGetListTimelineMinIDPagingUp() { var ( - ctx = context.Background() + ctx = suite.T().Context() list = suite.testLists["local_account_1_list_1"] ) @@ -335,7 +334,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineMinIDPagingUp() { func (suite *TimelineTestSuite) TestGetTagTimelineNoParams() { var ( - ctx = context.Background() + ctx = suite.T().Context() tag = suite.testTags["welcome"] ) diff --git a/internal/db/bundb/user_test.go b/internal/db/bundb/user_test.go index f5ece561d..a247bce42 100644 --- a/internal/db/bundb/user_test.go +++ b/internal/db/bundb/user_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" @@ -30,25 +29,25 @@ type UserTestSuite struct { } func (suite *UserTestSuite) TestGetAllUsers() { - users, err := suite.db.GetAllUsers(context.Background()) + users, err := suite.db.GetAllUsers(suite.T().Context()) suite.NoError(err) suite.Len(users, len(suite.testUsers)) } func (suite *UserTestSuite) TestGetUser() { - user, err := suite.db.GetUserByID(context.Background(), suite.testUsers["local_account_1"].ID) + user, err := suite.db.GetUserByID(suite.T().Context(), suite.testUsers["local_account_1"].ID) suite.NoError(err) suite.NotNil(user) } func (suite *UserTestSuite) TestGetUserByEmailAddress() { - user, err := suite.db.GetUserByEmailAddress(context.Background(), suite.testUsers["local_account_1"].Email) + user, err := suite.db.GetUserByEmailAddress(suite.T().Context(), suite.testUsers["local_account_1"].Email) suite.NoError(err) suite.NotNil(user) } func (suite *UserTestSuite) TestGetUserByAccountID() { - user, err := suite.db.GetUserByAccountID(context.Background(), suite.testAccounts["local_account_1"].ID) + user, err := suite.db.GetUserByAccountID(suite.T().Context(), suite.testAccounts["local_account_1"].ID) suite.NoError(err) suite.NotNil(user) } @@ -61,10 +60,10 @@ func (suite *UserTestSuite) TestUpdateUserSelectedColumns() { updateUser.Email = "whatever" updateUser.Locale = "es" - err := suite.db.UpdateUser(context.Background(), updateUser) + err := suite.db.UpdateUser(suite.T().Context(), updateUser) suite.NoError(err) - dbUser, err := suite.db.GetUserByID(context.Background(), testUser.ID) + dbUser, err := suite.db.GetUserByID(suite.T().Context(), testUser.ID) suite.NoError(err) suite.NotNil(dbUser) suite.Equal(updateUser.Email, dbUser.Email) diff --git a/internal/db/bundb/webpush_test.go b/internal/db/bundb/webpush_test.go index 8ca83955a..f750ca359 100644 --- a/internal/db/bundb/webpush_test.go +++ b/internal/db/bundb/webpush_test.go @@ -18,7 +18,6 @@ package bundb_test import ( - "context" "testing" "github.com/stretchr/testify/suite" @@ -30,7 +29,7 @@ type WebPushTestSuite struct { // Get the text fixture VAPID key pair. func (suite *WebPushTestSuite) TestGetVAPIDKeyPair() { - ctx := context.Background() + ctx := suite.T().Context() vapidKeyPair, err := suite.db.GetVAPIDKeyPair(ctx) suite.NoError(err) @@ -51,7 +50,7 @@ func (suite *WebPushTestSuite) TestGetVAPIDKeyPair() { // Generate a VAPID key pair when there isn't one. func (suite *WebPushTestSuite) TestGenerateVAPIDKeyPair() { - ctx := context.Background() + ctx := suite.T().Context() // Delete the text fixture VAPID key pair. if err := suite.db.DeleteVAPIDKeyPair(ctx); !suite.NoError(err) { |