diff options
Diffstat (limited to 'internal/api/client/accounts')
| -rw-r--r-- | internal/api/client/accounts/accountupdate_test.go | 11 | ||||
| -rw-r--r-- | internal/api/client/accounts/follow_test.go | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/internal/api/client/accounts/accountupdate_test.go b/internal/api/client/accounts/accountupdate_test.go index 1ab9f1fce..b234617a7 100644 --- a/internal/api/client/accounts/accountupdate_test.go +++ b/internal/api/client/accounts/accountupdate_test.go @@ -18,7 +18,6 @@ package accounts_test import ( - "context" "encoding/json" "fmt" "io" @@ -289,7 +288,7 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountCache() { // Get the account first to make sure it's in the database // cache. When the account is updated via the PATCH handler, // it should invalidate the cache and return the new version. - if _, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID); err != nil { + if _, err := suite.db.GetAccountByID(suite.T().Context(), suite.testAccounts["local_account_1"].ID); err != nil { suite.FailNow(err.Error()) } @@ -318,7 +317,7 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountDiscoverableForm() { suite.False(apimodelAccount.Discoverable) // Check the account in the database too. - dbZork, err := suite.db.GetAccountByID(context.Background(), apimodelAccount.ID) + dbZork, err := suite.db.GetAccountByID(suite.T().Context(), apimodelAccount.ID) suite.NoError(err) suite.False(*dbZork.Discoverable) } @@ -336,7 +335,7 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountDiscoverableFormData() { suite.False(apimodelAccount.Discoverable) // Check the account in the database too. - dbZork, err := suite.db.GetAccountByID(context.Background(), apimodelAccount.ID) + dbZork, err := suite.db.GetAccountByID(suite.T().Context(), apimodelAccount.ID) suite.NoError(err) suite.False(*dbZork.Discoverable) } @@ -355,7 +354,7 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountDiscoverableJSON() { suite.False(apimodelAccount.Discoverable) // Check the account in the database too. - dbZork, err := suite.db.GetAccountByID(context.Background(), apimodelAccount.ID) + dbZork, err := suite.db.GetAccountByID(suite.T().Context(), apimodelAccount.ID) suite.NoError(err) suite.False(*dbZork.Discoverable) } @@ -477,7 +476,7 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountSourceBadContentTypeFormDa suite.Equal(data["source[status_content_type]"][0], apimodelAccount.Source.StatusContentType) // Check the account in the database too. - dbAccount, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID) + dbAccount, err := suite.db.GetAccountByID(suite.T().Context(), suite.testAccounts["local_account_1"].ID) if err != nil { suite.FailNow(err.Error()) } diff --git a/internal/api/client/accounts/follow_test.go b/internal/api/client/accounts/follow_test.go index d87b8c9b9..1d470f126 100644 --- a/internal/api/client/accounts/follow_test.go +++ b/internal/api/client/accounts/follow_test.go @@ -18,7 +18,6 @@ package accounts_test import ( - "context" "encoding/json" "fmt" "io" @@ -102,7 +101,7 @@ func (suite *FollowTestSuite) TestGetFollowersPageOldestToNewestLimit6() { } func (suite *FollowTestSuite) testGetFollowersPage(limit int, direction string) { - ctx := context.Background() + ctx := suite.T().Context() // The authed local account we are going to use for HTTP requests requestingAccount := suite.testAccounts["local_account_1"] @@ -304,7 +303,7 @@ func (suite *FollowTestSuite) TestGetFollowingPageOldestToNewestLimit6() { } func (suite *FollowTestSuite) testGetFollowingPage(limit int, direction string) { - ctx := context.Background() + ctx := suite.T().Context() // The authed local account we are going to use for HTTP requests requestingAccount := suite.testAccounts["local_account_1"] @@ -483,19 +482,19 @@ func (suite *FollowTestSuite) testGetFollowingPage(limit int, direction string) func (suite *FollowTestSuite) clearAccountRelations(id string) { // Esnure no account blocks exist between accounts. _ = suite.db.DeleteAccountBlocks( - context.Background(), + suite.T().Context(), id, ) // Ensure no account follows exist between accounts. _ = suite.db.DeleteAccountFollows( - context.Background(), + suite.T().Context(), id, ) // Ensure no account follow_requests exist between accounts. _ = suite.db.DeleteAccountFollowRequests( - context.Background(), + suite.T().Context(), id, ) } |