Skip to content
This repository has been archived by the owner on Nov 25, 2024. It is now read-only.

Fix x86 tests #3317

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Fix x86 tests #3317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27a20ec
Fix parsing TopologyTokens
S7evinK Jan 29, 2024
f0105ae
Also for sync tokens
S7evinK Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions syncapi/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ func NewTopologyTokenFromString(tok string) (token TopologyToken, err error) {
if i > len(positions) {
break
}
var pos int
pos, err = strconv.Atoi(p)
var pos int64
pos, err = strconv.ParseInt(p, 10, 64)
if err != nil {
return
}
Expand Down Expand Up @@ -318,8 +318,8 @@ func NewStreamTokenFromString(tok string) (token StreamingToken, err error) {
if i >= len(positions) {
break
}
var pos int
pos, err = strconv.Atoi(p)
var pos int64
pos, err = strconv.ParseInt(p, 10, 64)
if err != nil {
err = ErrMalformedSyncToken
return
Expand Down
17 changes: 17 additions & 0 deletions syncapi/types/types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package types
import (
"context"
"encoding/json"
"math"
"reflect"
"testing"

Expand Down Expand Up @@ -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_2_3_5_0_0_0_6": StreamingToken{3, 1, 2, 3, 5, 0, 0, 0, 6}.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 {
if 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{
Expand Down
Loading