mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 07:42:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] Upgrade to Go 1.24 (#4187)

Browse source 
* 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>
This commit is contained in:
Daenney 2025-05-22 12:26:11 +02:00 • committed by kim
commit d5c9c4adc1
175 changed files with 857 additions and 1004 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/ap/ap_test.go
View file

@ -19,9 +19,9 @@ package ap_test
import (
"bytes"
"context"
"encoding/json"
"io"
"testing"
"code.superseriousbusiness.org/activity/streams"
"code.superseriousbusiness.org/activity/streams/vocab"
@ -250,7 +250,7 @@ func (suite *APTestSuite) noteWithHashtags1() ap.Statusable {
}`)
statusable, err := ap.ResolveStatusable(
context.Background(),
suite.T().Context(),
io.NopCloser(bytes.NewReader(noteJson)),
)
if err != nil {
@ -306,7 +306,7 @@ func addressable3() ap.Addressable {
return note
}
func addressable4() vocab.ActivityStreamsAnnounce {
func addressable4(t *testing.T) vocab.ActivityStreamsAnnounce {
// https://codeberg.org/superseriousbusiness/gotosocial/issues/267
announceJson := []byte(`
{
@ -326,12 +326,12 @@ func addressable4() vocab.ActivityStreamsAnnounce {
panic(err)
}
t, err := streams.ToType(context.Background(), jsonAsMap)
typ, err := streams.ToType(t.Context(), jsonAsMap)
if err != nil {
panic(err)
}
return t.(vocab.ActivityStreamsAnnounce)
return typ.(vocab.ActivityStreamsAnnounce)
}
func addressable5() ap.Addressable {
@ -366,7 +366,7 @@ func (suite *APTestSuite) jsonToType(rawJson string) (vocab.Type, map[string]int
panic(err)
}
t, err := streams.ToType(context.Background(), raw)
t, err := streams.ToType(suite.T().Context(), raw)
if err != nil {
panic(err)
}
@ -395,7 +395,7 @@ func (suite *APTestSuite) SetupTest() {
suite.addressable1 = addressable1()
suite.addressable2 = addressable2()
suite.addressable3 = addressable3()
suite.addressable4 = addressable4()
suite.addressable4 = addressable4(suite.T())
suite.addressable5 = addressable5()
suite.testAccounts = testrig.NewTestAccounts()
}

3
internal/ap/extractattachments_test.go
View file

@ -18,7 +18,6 @@
package ap_test
import (
"context"
"encoding/json"
"testing"
@ -59,7 +58,7 @@ func (suite *ExtractAttachmentsTestSuite) TestExtractDescription() {
suite.FailNow(err.Error())
}
t, err := streams.ToType(context.Background(), raw)
t, err := streams.ToType(suite.T().Context(), raw)
if err != nil {
suite.FailNow(err.Error())
}

9
internal/ap/extractemojis_test.go
View file

@ -19,7 +19,6 @@ package ap_test
import (
"bytes"
"context"
"io"
"testing"
@ -61,7 +60,7 @@ func (suite *ExtractEmojisTestSuite) TestExtractEmojis() {
}`
statusable, err := ap.ResolveStatusable(
context.Background(),
suite.T().Context(),
io.NopCloser(bytes.NewBufferString(noteWithEmojis)),
)
if err != nil {
@ -115,7 +114,7 @@ func (suite *ExtractEmojisTestSuite) TestExtractEmojisNoID() {
}`
statusable, err := ap.ResolveStatusable(
context.Background(),
suite.T().Context(),
io.NopCloser(bytes.NewBufferString(noteWithEmojis)),
)
if err != nil {
@ -170,7 +169,7 @@ func (suite *ExtractEmojisTestSuite) TestExtractEmojisNullID() {
}`
statusable, err := ap.ResolveStatusable(
context.Background(),
suite.T().Context(),
io.NopCloser(bytes.NewBufferString(noteWithEmojis)),
)
if err != nil {
@ -225,7 +224,7 @@ func (suite *ExtractEmojisTestSuite) TestExtractEmojisEmptyID() {
}`
statusable, err := ap.ResolveStatusable(
context.Background(),
suite.T().Context(),
io.NopCloser(bytes.NewBufferString(noteWithEmojis)),
)
if err != nil {

3
internal/ap/extractfocus_test.go
View file

@ -18,7 +18,6 @@
package ap_test
import (
"context"
"encoding/json"
"fmt"
"testing"
@ -33,7 +32,7 @@ type ExtractFocusTestSuite struct {
}
func (suite *ExtractFocusTestSuite) TestExtractFocus() {
ctx := context.Background()
ctx := suite.T().Context()
type test struct {
data string

5
internal/ap/extractpolicy_test.go
View file

@ -19,7 +19,6 @@ package ap_test
import (
"bytes"
"context"
"io"
"testing"
@ -86,7 +85,7 @@ func (suite *ExtractPolicyTestSuite) TestExtractPolicy() {
}`
statusable, err := ap.ResolveStatusable(
context.Background(),
suite.T().Context(),
io.NopCloser(
bytes.NewBufferString(rawNote),
),
@ -186,7 +185,7 @@ func (suite *ExtractPolicyTestSuite) TestExtractPolicyDeprecated() {
}`
statusable, err := ap.ResolveStatusable(
context.Background(),
suite.T().Context(),
io.NopCloser(
bytes.NewBufferString(rawNote),
),

3
internal/ap/extractpubkey_test.go
View file

@ -18,7 +18,6 @@
package ap_test
import (
"context"
"encoding/json"
"testing"
@ -62,7 +61,7 @@ func (suite *ExtractPubKeyTestSuite) TestExtractPubKeyFromStub() {
suite.FailNow(err.Error())
}
t, err := streams.ToType(context.Background(), m)
t, err := streams.ToType(suite.T().Context(), m)
if err != nil {
suite.FailNow(err.Error())
}

11
internal/ap/resolve_test.go
View file

@ -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() {
<title>.</title>`)
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)