Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed unit tests where SequencePair comparisons fail due to last_active #2446

Merged
merged 2 commits into from Aug 17, 2021
Merged

fixed unit tests where SequencePair comparisons fail due to last_active #2446

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ec87a5
fixed unit tests where SequencePair comparisons fail due to time last…
matthiashanel Aug 17, 2021
fc9af36
updated go client for tests
matthiashanel Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions server/jetstream_cluster_test.go
View file
Open in desktop
Expand Up @@ -620,10 +620,12 @@ func TestJetStreamClusterConsumerState(t *testing.T) {
if err != nil {
t.Fatalf("Unexpected error getting consumer info: %v", err)
}

// nil out timestamp for better comparison
nci.Delivered.Last, ci.Delivered.Last = nil, nil
if nci.Delivered != ci.Delivered {
t.Fatalf("Consumer delivered did not match after leader switch, wanted %+v, got %+v", ci.Delivered, nci.Delivered)
}
nci.AckFloor.Last, ci.AckFloor.Last = nil, nil
if nci.AckFloor != ci.AckFloor {
t.Fatalf("Consumer ackfloor did not match after leader switch, wanted %+v, got %+v", ci.AckFloor, nci.AckFloor)
}
Expand Down Expand Up @@ -1048,6 +1050,9 @@ func TestJetStreamClusterStreamPublishWithActiveConsumers(t *testing.T) {
ci.Cluster = nil
ci2.Cluster = nil

// nil out timestamp for better comparison
ci.Delivered.Last, ci2.Delivered.Last = nil, nil
ci.AckFloor.Last, ci2.AckFloor.Last = nil, nil
if !reflect.DeepEqual(ci, ci2) {
t.Fatalf("Consumer info did not match: %+v vs %+v", ci, ci2)
}
Expand Down Expand Up @@ -2694,10 +2699,12 @@ func TestJetStreamClusterUserSnapshotAndRestore(t *testing.T) {
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}

// nil out timestamp for better comparison
nci.Delivered.Last, ci.Delivered.Last = nil, nil
if nci.Delivered != ci.Delivered {
t.Fatalf("Delivered states do not match %+v vs %+v", nci.Delivered, ci.Delivered)
}
nci.AckFloor.Last, ci.AckFloor.Last = nil, nil
if nci.AckFloor != ci.AckFloor {
t.Fatalf("Ack floors did not match %+v vs %+v", nci.AckFloor, ci.AckFloor)
}
Expand Down
2 changes: 2 additions & 0 deletions server/jetstream_test.go
View file
Open in desktop
Expand Up @@ -12057,6 +12057,8 @@ func TestJetStreamServerEncryption(t *testing.T) {
// Consumer create times can be slightly off after restore from disk.
now := time.Now()
ci.Created, ci2.Created = now, now
ci.Delivered.Last, ci2.Delivered.Last = nil, nil
ci.AckFloor.Last, ci2.AckFloor.Last = nil, nil
// Also clusters will be different.
ci.Cluster, ci2.Cluster = nil, nil
if !reflect.DeepEqual(ci, ci2) {
Expand Down