mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-22 14:21:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix x86 tests (#3317)

Browse source 
x86 tests broke with #3298
(Not exactly the tests modified here, but
`TestMessageHistoryVisibility`)
This commit is contained in:
Till 2024-01-29 20:44:43 +01:00 committed by GitHub
parent 87f028db27
commit a3a18fbcce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
syncapi/types/types.go
View file

@ -286,8 +286,8 @@ func NewTopologyTokenFromString(tok string) (token TopologyToken, err error) {
if i > len(positions) { if i > len(positions) {
break break
} }
var pos int var pos int64
pos, err = strconv.Atoi(p) pos, err = strconv.ParseInt(p, 10, 64)
if err != nil { if err != nil {
return return
} }
@ -318,8 +318,8 @@ func NewStreamTokenFromString(tok string) (token StreamingToken, err error) {
if i >= len(positions) { if i >= len(positions) {
break break
} }
var pos int var pos int64
pos, err = strconv.Atoi(p) pos, err = strconv.ParseInt(p, 10, 64)
if err != nil { if err != nil {
err = ErrMalformedSyncToken err = ErrMalformedSyncToken
return return

17
syncapi/types/types_test.go
View file

@ -3,6 +3,7 @@ package types
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"math"
"reflect" "reflect"
"testing" "testing"
@ -33,12 +34,28 @@ func TestSyncTokens(t *testing.T) {
"s3_1_0_0_0_0_2_0_5": StreamingToken{3, 1, 0, 0, 0, 0, 2, 0, 5}.String(), "s3_1_0_0_0_0_2_0_5": StreamingToken{3, 1, 0, 0, 0, 0, 2, 0, 5}.String(),
"s3_1_2_3_5_0_0_0_6": StreamingToken{3, 1, 2, 3, 5, 0, 0, 0, 6}.String(), "s3_1_2_3_5_0_0_0_6": StreamingToken{3, 1, 2, 3, 5, 0, 0, 0, 6}.String(),
"t3_1": TopologyToken{3, 1}.String(), "t3_1": TopologyToken{3, 1}.String(),
"t9223372036854775807_9223372036854775807": TopologyToken{Depth: math.MaxInt64, PDUPosition: math.MaxInt64}.String(),
"s9223372036854775807_1_2_3_5_0_0_0_6": StreamingToken{math.MaxInt64, 1, 2, 3, 5, 0, 0, 0, 6}.String(),
} }
for a, b := range shouldPass { for a, b := range shouldPass {
if a != b { if a != b {
t.Errorf("expected %q, got %q", a, b) t.Errorf("expected %q, got %q", a, b)
} }
// parse as topology token
if a[0] == 't' {
if _, err := NewTopologyTokenFromString(a); err != nil {
t.Errorf("expected %q to pass, but got %q", a, err)
}
}
// parse as sync token
if a[0] == 's' {
if _, err := NewStreamTokenFromString(a); err != nil {
t.Errorf("expected %q to pass, but got %q", a, err)
}
}
} }
shouldFail := []string{ shouldFail := []string{