diff --git a/federationapi/federationapi_test.go b/federationapi/federationapi_test.go index b381a6c31..cf7d732bf 100644 --- a/federationapi/federationapi_test.go +++ b/federationapi/federationapi_test.go @@ -59,7 +59,7 @@ func TestRoomsV3URLEscapeDoNot404(t *testing.T) { eventJSON: `{"auth_events":["$x4MKEPRSF6OGlo0qpnsP3BfSmYX5HhVlykOsQH3ECyg","$BcEcbZnlFLB5rxSNSZNBn6fO3jU/TKAJ79wfKyCQLiU"],"content":{"body":"Test Message"},"depth":8,"hashes":{"sha256":"dfK0MBn1RZZqCVJqWsn/MGY7QJHjQcwqF0unOonLCTU"},"origin":"localhost","origin_server_ts":0,"prev_events":["$1SwcZ1XY/Y8yKLjP4DzAOHN5WFBcDAZxb5vFDnW2ubA"],"room_id":"!roomid:localhost","sender":"@userid:localhost","signatures":{"localhost":{"ed25519:auto":"INOjuWMg+GmFkUpmzhMB0bqLNs73mSvwldY1ftYIQ/B3lD9soD2OMG3AF+wgZW/I8xqzY4DOHfbnbUeYPf67BA"}},"type":"m.room.message"}`, roomVer: gomatrixserverlib.RoomVersionV3, }, - // muliple / + // multiple / // EventID: $OzENBCuVv/fnRAYCeQudIon/84/V5pxtEjQMTgi3emk { eventJSON: `{"auth_events":["$x4MKEPRSF6OGlo0qpnsP3BfSmYX5HhVlykOsQH3ECyg","$BcEcbZnlFLB5rxSNSZNBn6fO3jU/TKAJ79wfKyCQLiU"],"content":{"body":"Test Message"},"depth":2,"hashes":{"sha256":"U5+WsiJAhiEM88J8HTjuUjPImVGVzDFD3v/WS+jb2f0"},"origin":"localhost","origin_server_ts":0,"prev_events":["$BcEcbZnlFLB5rxSNSZNBn6fO3jU/TKAJ79wfKyCQLiU"],"room_id":"!roomid:localhost","sender":"@userid:localhost","signatures":{"localhost":{"ed25519:auto":"tKS469e9+wdWPEKB/LbBJWQ8vfOOdKgTWER5IwbSAH1CxmLvkCziUsgVu85zfzDSLoUi5mU5FHLiMTC6P/qICw"}},"type":"m.room.message"}`, diff --git a/internal/test/server.go b/internal/test/server.go index 85738df5f..c3348d533 100644 --- a/internal/test/server.go +++ b/internal/test/server.go @@ -147,7 +147,7 @@ func ListenAndServe(t *testing.T, router http.Handler, useTLS bool) (apiURL stri secure = "s" } return fmt.Sprintf("http%s://localhost:%d", secure, port), func() { - srv.Shutdown(context.Background()) + _ = srv.Shutdown(context.Background()) wg.Wait() } }