From 390fd02918acf9469bcd6c9bb8039fa78fa08424 Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Tue, 31 Jan 2023 09:42:04 -0800 Subject: [PATCH] Updates to tests for updated Go client changes Signed-off-by: Derek Collison --- server/jetstream_cluster_2_test.go | 9 +-------- server/jetstream_cluster_3_test.go | 2 +- server/norace_test.go | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/server/jetstream_cluster_2_test.go b/server/jetstream_cluster_2_test.go index 42042bed..2b38c45f 100644 --- a/server/jetstream_cluster_2_test.go +++ b/server/jetstream_cluster_2_test.go @@ -3501,12 +3501,8 @@ func TestJetStreamClusterConsumerUpdates(t *testing.T) { defer sub.Unsubscribe() ncfg := *cfg + // Deliver Subject ncfg.DeliverSubject = "d.baz" - - // Should fail. - _, err = js.AddConsumer("TEST", &ncfg) - require_Error(t, err) - // Description cfg.Description = "New Description" _, err = js.UpdateConsumer("TEST", cfg) @@ -4236,9 +4232,6 @@ func TestJetStreamClusterConsumerUpgrade(t *testing.T) { // First create a consumer that is push based. _, err = js.AddConsumer("X", &nats.ConsumerConfig{Durable: "dlc", DeliverSubject: "Y"}) require_NoError(t, err) - // Now do same name but pull. This should be an error. - _, err = js.AddConsumer("X", &nats.ConsumerConfig{Durable: "dlc"}) - require_Error(t, err) } t.Run("Single", func(t *testing.T) { testUpdate(t, s) }) diff --git a/server/jetstream_cluster_3_test.go b/server/jetstream_cluster_3_test.go index d3fd566e..6b8f3f5a 100644 --- a/server/jetstream_cluster_3_test.go +++ b/server/jetstream_cluster_3_test.go @@ -931,7 +931,7 @@ func TestJetStreamClusterSignalPullConsumersOnDelete(t *testing.T) { // We want to make sure we get kicked out prior to the timeout // when consumers are being deleted or the parent stream is being deleted. // Note this should be lower case, Go client needs to be updated. - expectedErr := errors.New("nats: Consumer Deleted") + expectedErr := errors.New("nats: consumer deleted") // Queue up the delete for sub1 time.AfterFunc(250*time.Millisecond, func() { js.DeleteConsumer("TEST", "d1") }) diff --git a/server/norace_test.go b/server/norace_test.go index ad08394e..7ee066c2 100644 --- a/server/norace_test.go +++ b/server/norace_test.go @@ -5028,7 +5028,7 @@ func TestNoRaceJetStreamPullConsumersAndInteriorDeletes(t *testing.T) { select { case <-ch: // OK - case <-time.After(20 * time.Second): + case <-time.After(30 * time.Second): t.Fatalf("Consumers took too long to consumer all messages") } }