From d5c9c4adc167cdb05e73f5105702cf340293e61c Mon Sep 17 00:00:00 2001 From: Daenney Date: Thu, 22 May 2025 12:26:11 +0200 Subject: [chore] Upgrade to Go 1.24 (#4187) * Set `go.mod` to 1.24 now that it's been out for 3 months. * Update all the test to use `testing.T.Context()`. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4187 Co-authored-by: Daenney Co-committed-by: Daenney --- internal/ap/resolve_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'internal/ap/resolve_test.go') diff --git a/internal/ap/resolve_test.go b/internal/ap/resolve_test.go index a5e279fa2..4909a7505 100644 --- a/internal/ap/resolve_test.go +++ b/internal/ap/resolve_test.go @@ -19,7 +19,6 @@ package ap_test import ( "bytes" - "context" "io" "testing" @@ -36,7 +35,7 @@ func (suite *ResolveTestSuite) TestResolveDocumentAsStatusable() { b := []byte(suite.typeToJson(suite.document1)) statusable, err := ap.ResolveStatusable( - context.Background(), io.NopCloser(bytes.NewReader(b)), + suite.T().Context(), io.NopCloser(bytes.NewReader(b)), ) suite.NoError(err) suite.NotNil(statusable) @@ -46,7 +45,7 @@ func (suite *ResolveTestSuite) TestResolveDocumentAsAccountable() { b := []byte(suite.typeToJson(suite.document1)) accountable, err := ap.ResolveAccountable( - context.Background(), io.NopCloser(bytes.NewReader(b)), + suite.T().Context(), io.NopCloser(bytes.NewReader(b)), ) suite.True(gtserror.IsWrongType(err)) suite.EqualError(err, "ResolveAccountable: cannot resolve vocab type *typedocument.ActivityStreamsDocument as accountable") @@ -58,7 +57,7 @@ func (suite *ResolveTestSuite) TestResolveHTMLAsAccountable() { .`) accountable, err := ap.ResolveAccountable( - context.Background(), io.NopCloser(bytes.NewReader(b)), + suite.T().Context(), io.NopCloser(bytes.NewReader(b)), ) suite.True(gtserror.IsWrongType(err)) suite.EqualError(err, "ResolveAccountable: error decoding into json: invalid character '<' looking for beginning of value") @@ -73,7 +72,7 @@ func (suite *ResolveTestSuite) TestResolveNonAPJSONAsAccountable() { }`) accountable, err := ap.ResolveAccountable( - context.Background(), io.NopCloser(bytes.NewReader(b)), + suite.T().Context(), io.NopCloser(bytes.NewReader(b)), ) suite.True(gtserror.IsWrongType(err)) suite.EqualError(err, "ResolveAccountable: error resolving json into ap vocab type: activity stream did not match any known types") @@ -124,7 +123,7 @@ func (suite *ResolveTestSuite) TestResolveBandwagonAlbumAsStatusable() { }`) statusable, err := ap.ResolveStatusable( - context.Background(), io.NopCloser(bytes.NewReader(b)), + suite.T().Context(), io.NopCloser(bytes.NewReader(b)), ) suite.NoError(err) suite.NotNil(statusable) -- cgit v1.2.3