Skip to content

Commit 45e5397

Browse files
committed
Fix tests that were looking for timeout errors vs no responders
Signed-off-by: Derek Collison <[email protected]>
1 parent a36db02 commit 45e5397

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

server/jetstream_cluster_2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7132,7 +7132,7 @@ func TestJetStreamClusterStreamDirectGetNotTooSoon(t *testing.T) {
71327132
defer nc.Close()
71337133

71347134
_, err = nc.Request(getSubj, nil, time.Second)
7135-
require_Error(t, err, nats.ErrTimeout)
7135+
require_Error(t, err, nats.ErrNoResponders)
71367136

71377137
// Now start all and make sure they all eventually have subs for direct access.
71387138
c.restartAll()

server/jwt_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6219,8 +6219,7 @@ func TestJWTAccountProtectedImport(t *testing.T) {
62196219

62206220
// ensure service fails
62216221
_, err = ncImp.Request(srvcSub, []byte("hello"), time.Second)
6222-
require_Error(t, err)
6223-
require_Contains(t, err.Error(), "timeout")
6222+
require_Error(t, err, nats.ErrNoResponders)
62246223
s.AccountResolver().Store(exportPub, exportJWTOn)
62256224
// ensure stream fails
62266225
err = ncExp.Publish(strmSub, []byte("hello"))

server/msgtrace_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,7 +1799,7 @@ func TestMsgTraceServiceImport(t *testing.T) {
17991799
}
18001800
}
18011801
// Check that no (more) messages are received.
1802-
if msg, err := sub.NextMsg(100 * time.Millisecond); msg != nil || err != nats.ErrTimeout {
1802+
if msg, err := sub.NextMsg(100 * time.Millisecond); msg != nil || (err != nats.ErrTimeout && err != nats.ErrNoResponders) {
18031803
t.Fatalf("Did not expect application message, got msg=%v err=%v", msg, err)
18041804
}
18051805
if !test.deliverMsg {
@@ -2072,7 +2072,7 @@ func TestMsgTraceServiceImportWithSuperCluster(t *testing.T) {
20722072
}
20732073
}
20742074
// Check that no (more) messages are received.
2075-
if msg, err := sub.NextMsg(100 * time.Millisecond); msg != nil || err != nats.ErrTimeout {
2075+
if msg, err := sub.NextMsg(100 * time.Millisecond); msg != nil || (err != nats.ErrTimeout && err != nats.ErrNoResponders) {
20762076
t.Fatalf("Did not expect application message, got msg=%v err=%v", msg, err)
20772077
}
20782078
if !test.deliverMsg {
@@ -2523,7 +2523,7 @@ func TestMsgTraceServiceImportWithLeafNodeLeaf(t *testing.T) {
25232523
require_Equal[string](t, string(appMsg.Data), "request2")
25242524
}
25252525
// Check that no (more) messages are received.
2526-
if msg, err := sub.NextMsg(100 * time.Millisecond); msg != nil || err != nats.ErrTimeout {
2526+
if msg, err := sub.NextMsg(100 * time.Millisecond); msg != nil || (err != nats.ErrTimeout && err != nats.ErrNoResponders) {
25272527
t.Fatalf("Did not expect application message, got msg=%v err=%v", msg, err)
25282528
}
25292529
if !test.deliverMsg {

0 commit comments

Comments
 (0)