diff options
Diffstat (limited to 'internal/api/client/statuses')
4 files changed, 7 insertions, 11 deletions
diff --git a/internal/api/client/statuses/statusboost_test.go b/internal/api/client/statuses/statusboost_test.go index abbe4857b..a108c436c 100644 --- a/internal/api/client/statuses/statusboost_test.go +++ b/internal/api/client/statuses/statusboost_test.go @@ -16,7 +16,6 @@ package statuses_test import ( - "context" "net/http" "net/http/httptest" "strings" @@ -499,7 +498,7 @@ func (suite *StatusBoostTestSuite) TestPostUnboostable() { func (suite *StatusBoostTestSuite) TestPostNotVisible() { // Stop local_account_2 following zork. err := suite.db.DeleteFollowByID( - context.Background(), + suite.T().Context(), suite.testFollows["local_account_2_local_account_1"].ID, ) if err != nil { @@ -714,7 +713,7 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { // Target status should no // longer be pending approval. dbStatus, err := suite.state.DB.GetStatusByID( - context.Background(), + suite.T().Context(), targetStatus.ID, ) if err != nil { @@ -725,7 +724,7 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { // There should be an Accept // stored for the target status. intReq, err := suite.state.DB.GetInteractionRequestByInteractionURI( - context.Background(), targetStatus.URI, + suite.T().Context(), targetStatus.URI, ) if err != nil { suite.FailNow(err.Error()) diff --git a/internal/api/client/statuses/statuscreate_test.go b/internal/api/client/statuses/statuscreate_test.go index 60069d362..548eced29 100644 --- a/internal/api/client/statuses/statuscreate_test.go +++ b/internal/api/client/statuses/statuscreate_test.go @@ -19,7 +19,6 @@ package statuses_test import ( "bytes" - "context" "encoding/json" "fmt" "io" @@ -671,7 +670,7 @@ func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() { // so it gets looked up again when we mention it. remoteAccount := suite.testAccounts["remote_account_1"] if err := suite.db.DeleteAccount( - context.Background(), + suite.T().Context(), remoteAccount.ID, ); err != nil { suite.FailNow(err.Error()) diff --git a/internal/api/client/statuses/statusfave_test.go b/internal/api/client/statuses/statusfave_test.go index 11c03cc5b..515b66a3c 100644 --- a/internal/api/client/statuses/statusfave_test.go +++ b/internal/api/client/statuses/statusfave_test.go @@ -18,7 +18,6 @@ package statuses_test import ( - "context" "net/http" "net/http/httptest" "strings" @@ -203,7 +202,7 @@ func (suite *StatusFaveTestSuite) TestPostUnfaveable() { // Fave a status that's pending approval by us. func (suite *StatusFaveTestSuite) TestPostFaveImplicitAccept() { var ( - ctx = context.Background() + ctx = suite.T().Context() targetStatus = suite.testStatuses["admin_account_status_5"] app = suite.testApplications["application_1"] token = suite.testTokens["local_account_2"] diff --git a/internal/api/client/statuses/statuspin_test.go b/internal/api/client/statuses/statuspin_test.go index 87650dd43..cbefb3977 100644 --- a/internal/api/client/statuses/statuspin_test.go +++ b/internal/api/client/statuses/statuspin_test.go @@ -18,7 +18,6 @@ package statuses_test import ( - "context" "encoding/json" "io/ioutil" "net/http" @@ -135,7 +134,7 @@ func (suite *StatusPinTestSuite) TestPinStatusTwiceError() { testAccount := new(gtsmodel.Account) *testAccount = *suite.testAccounts["local_account_1"] - if err := suite.db.UpdateStatus(context.Background(), targetStatus, "pinned_at"); err != nil { + if err := suite.db.UpdateStatus(suite.T().Context(), targetStatus, "pinned_at"); err != nil { suite.FailNow(err.Error()) } @@ -171,7 +170,7 @@ func (suite *StatusPinTestSuite) TestPinStatusTooManyPins() { *testAccount = *suite.testAccounts["local_account_1"] // Spam 10 pinned statuses into the database. - ctx := context.Background() + ctx := suite.T().Context() for i := range make([]interface{}, 10) { status := >smodel.Status{ ID: id.NewULID(), |