diff options
Diffstat (limited to 'internal/api/client/admin')
5 files changed, 14 insertions, 19 deletions
diff --git a/internal/api/client/admin/domainpermissionsubscriptiontest_test.go b/internal/api/client/admin/domainpermissionsubscriptiontest_test.go index 6d3356f0e..49ab3c330 100644 --- a/internal/api/client/admin/domainpermissionsubscriptiontest_test.go +++ b/internal/api/client/admin/domainpermissionsubscriptiontest_test.go @@ -19,7 +19,6 @@ package admin_test import ( "bytes" - "context" "encoding/json" "io" "net/http" @@ -41,7 +40,7 @@ type DomainPermissionSubscriptionTestTestSuite struct { func (suite *DomainPermissionSubscriptionTestTestSuite) TestDomainPermissionSubscriptionTestCSV() { var ( - ctx = context.Background() + ctx = suite.T().Context() testAccount = suite.testAccounts["admin_account"] permSub = >smodel.DomainPermissionSubscription{ ID: "01JGE681TQSBPAV59GZXPKE62H", @@ -129,7 +128,7 @@ func (suite *DomainPermissionSubscriptionTestTestSuite) TestDomainPermissionSubs func (suite *DomainPermissionSubscriptionTestTestSuite) TestDomainPermissionSubscriptionTestText() { var ( - ctx = context.Background() + ctx = suite.T().Context() testAccount = suite.testAccounts["admin_account"] permSub = >smodel.DomainPermissionSubscription{ ID: "01JGE681TQSBPAV59GZXPKE62H", diff --git a/internal/api/client/admin/emojicreate_test.go b/internal/api/client/admin/emojicreate_test.go index 1a6983c21..3970ced09 100644 --- a/internal/api/client/admin/emojicreate_test.go +++ b/internal/api/client/admin/emojicreate_test.go @@ -18,7 +18,6 @@ package admin_test import ( - "context" "encoding/json" "io/ioutil" "net/http" @@ -77,7 +76,7 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateNewCategory() { suite.True(apiEmoji.VisibleInPicker) // emoji should be in the db - dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(context.Background(), apiEmoji.Shortcode, "") + dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(suite.T().Context(), apiEmoji.Shortcode, "") suite.NoError(err) // check fields on the emoji @@ -150,7 +149,7 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateExistingCategory() { suite.True(apiEmoji.VisibleInPicker) // emoji should be in the db - dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(context.Background(), apiEmoji.Shortcode, "") + dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(suite.T().Context(), apiEmoji.Shortcode, "") suite.NoError(err) // check fields on the emoji @@ -223,7 +222,7 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateNoCategory() { suite.True(apiEmoji.VisibleInPicker) // emoji should be in the db - dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(context.Background(), apiEmoji.Shortcode, "") + dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(suite.T().Context(), apiEmoji.Shortcode, "") suite.NoError(err) // check fields on the emoji diff --git a/internal/api/client/admin/emojidelete_test.go b/internal/api/client/admin/emojidelete_test.go index c327bed94..1672a4e71 100644 --- a/internal/api/client/admin/emojidelete_test.go +++ b/internal/api/client/admin/emojidelete_test.go @@ -19,7 +19,6 @@ package admin_test import ( "bytes" - "context" "encoding/json" "io" "net/http" @@ -68,7 +67,7 @@ func (suite *EmojiDeleteTestSuite) TestEmojiDelete1() { }`, dst.String()) // emoji should no longer be in the db - 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) } @@ -91,7 +90,7 @@ func (suite *EmojiDeleteTestSuite) TestEmojiDelete2() { suite.Equal(`{"error":"Bad Request: emoji with id 01GD5KP5CQEE1R3X43Y1EHS2CW was not a local emoji, will not delete"}`, string(b)) // emoji should still be in the db - dbEmoji, err := suite.db.GetEmojiByID(context.Background(), testEmoji.ID) + dbEmoji, err := suite.db.GetEmojiByID(suite.T().Context(), testEmoji.ID) suite.NoError(err) suite.NotNil(dbEmoji) } diff --git a/internal/api/client/admin/emojiupdate_test.go b/internal/api/client/admin/emojiupdate_test.go index 91a9ec8f4..6fc8d826e 100644 --- a/internal/api/client/admin/emojiupdate_test.go +++ b/internal/api/client/admin/emojiupdate_test.go @@ -18,7 +18,6 @@ package admin_test import ( - "context" "encoding/json" "io" "net/http" @@ -84,7 +83,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateNewCategory() { suite.True(adminEmoji.VisibleInPicker) // emoji should be in the db - dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(context.Background(), adminEmoji.Shortcode, "") + dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(suite.T().Context(), adminEmoji.Shortcode, "") suite.NoError(err) // check fields on the emoji @@ -161,7 +160,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateSwitchCategory() { suite.True(adminEmoji.VisibleInPicker) // emoji should be in the db - dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(context.Background(), adminEmoji.Shortcode, "") + dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(suite.T().Context(), adminEmoji.Shortcode, "") suite.NoError(err) // check fields on the emoji @@ -239,7 +238,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateCopyRemoteToLocal() { suite.True(adminEmoji.VisibleInPicker) // emoji should be in the db - dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(context.Background(), adminEmoji.Shortcode, "") + dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(suite.T().Context(), adminEmoji.Shortcode, "") suite.NoError(err) // check fields on the emoji @@ -387,7 +386,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateModify() { suite.True(adminEmoji.VisibleInPicker) // emoji should be in the db - dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(context.Background(), adminEmoji.Shortcode, "") + dbEmoji, err := suite.db.GetEmojiByShortcodeDomain(suite.T().Context(), adminEmoji.Shortcode, "") suite.NoError(err) // check fields on the emoji diff --git a/internal/api/client/admin/mediacleanup_test.go b/internal/api/client/admin/mediacleanup_test.go index 8224b875f..8efef54c4 100644 --- a/internal/api/client/admin/mediacleanup_test.go +++ b/internal/api/client/admin/mediacleanup_test.go @@ -18,7 +18,6 @@ package admin_test import ( - "context" "net/http" "net/http/httptest" "testing" @@ -49,7 +48,7 @@ func (suite *MediaCleanupTestSuite) TestMediaCleanup() { // the attachment should be updated in the database if !testrig.WaitFor(func() bool { - if prunedAttachment, _ := suite.db.GetAttachmentByID(context.Background(), testAttachment.ID); prunedAttachment != nil { + if prunedAttachment, _ := suite.db.GetAttachmentByID(suite.T().Context(), testAttachment.ID); prunedAttachment != nil { return !*prunedAttachment.Cached } return false @@ -74,7 +73,7 @@ func (suite *MediaCleanupTestSuite) TestMediaCleanupNoArg() { suite.Equal(http.StatusOK, recorder.Code) if !testrig.WaitFor(func() bool { - if prunedAttachment, _ := suite.db.GetAttachmentByID(context.Background(), testAttachment.ID); prunedAttachment != nil { + if prunedAttachment, _ := suite.db.GetAttachmentByID(suite.T().Context(), testAttachment.ID); prunedAttachment != nil { return !*prunedAttachment.Cached } return false @@ -101,7 +100,7 @@ func (suite *MediaCleanupTestSuite) TestMediaCleanupNotOldEnough() { time.Sleep(1 * time.Second) // Get media we pruned - prunedAttachment, err := suite.db.GetAttachmentByID(context.Background(), testAttachment.ID) + prunedAttachment, err := suite.db.GetAttachmentByID(suite.T().Context(), testAttachment.ID) suite.NoError(err) // the media should still be cached |