Merge pull request #2446 from nats-io/sequence-pair-last

fixed unit tests where SequencePair comparisons fail due to last_active

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/klauspost/compress v1.11.12
 	github.com/minio/highwayhash v1.0.1
 	github.com/nats-io/jwt/v2 v2.0.3
-	github.com/nats-io/nats.go v1.11.1-0.20210813172934-9c00d13a8a19
+	github.com/nats-io/nats.go v1.11.1-0.20210817011318-78b4cc260af9
 	github.com/nats-io/nkeys v0.3.0
 	github.com/nats-io/nuid v1.0.1
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e

go.sum

@@ -24,6 +24,8 @@ github.com/nats-io/nats.go v1.11.1-0.20210810010129-d1955c8653ca h1:9MdvV5kneekw
 github.com/nats-io/nats.go v1.11.1-0.20210810010129-d1955c8653ca/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
 github.com/nats-io/nats.go v1.11.1-0.20210813172934-9c00d13a8a19 h1:9WQzXoYc37xBQ9YoQSSc1aoMJCvzX5OmirlivU0GEFU=
 github.com/nats-io/nats.go v1.11.1-0.20210813172934-9c00d13a8a19/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
+github.com/nats-io/nats.go v1.11.1-0.20210817011318-78b4cc260af9 h1:aJYmbbVrq6rsFGAvQnAvoChjkjUOJGqVBdQ47vbEWD4=
+github.com/nats-io/nats.go v1.11.1-0.20210817011318-78b4cc260af9/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
 github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
 github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=

server/jetstream_cluster_test.go

@@ -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)
 	}
@@ -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)
 	}
@@ -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)
 	}

server/jetstream_test.go

@@ -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) {