gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-17 11:24:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve TestJetStreamAccountImportJSAdvisoriesAsStream (#4504)

Browse Source 
This updates the test to not fail if the advisories arrive in the
reverse order.

Signed-off-by: Neil Twigg <neil@nats.io>
This commit is contained in:
Neil
2023-09-08 15:36:42 +01:00
committed by GitHub
parent 0b35767307 ede9a6cdfe
commit 71694904cf
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
server/jetstream_test.go
View File

@@ -10707,38 +10707,45 @@ func TestJetStreamAccountImportJSAdvisoriesAsStream(t *testing.T) {
if err != nil {
t.Fatalf("Unexpected error adding stream: %v", err)
}
msg, err := subJS.NextMsg(time.Second)
if err != nil {
t.Fatalf("Unexpected error: %v", err)
var gotAPIAdvisory, gotCreateAdvisory bool
for i := 0; i < 2; i++ {
msg, err := subJS.NextMsg(time.Second * 2)
if err != nil {
t.Fatalf("Unexpected error on JS account: %v", err)
}
switch msg.Subject {
case "$JS.EVENT.ADVISORY.STREAM.CREATED.ORDERS":
gotCreateAdvisory = true
case "$JS.EVENT.ADVISORY.API":
gotAPIAdvisory = true
default:
t.Fatalf("Unexpected subject: %q", msg.Subject)
}
}
if msg.Subject != "$JS.EVENT.ADVISORY.STREAM.CREATED.ORDERS" {
t.Fatalf("Unexpected subject: %q", msg.Subject)
}
msg, err = subJS.NextMsg(time.Second)
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
if msg.Subject != "$JS.EVENT.ADVISORY.API" {
t.Fatalf("Unexpected subject: %q", msg.Subject)
if !gotAPIAdvisory || !gotCreateAdvisory {
t.Fatalf("Expected to have received both advisories on JS account (API advisory %v, create advisory %v)", gotAPIAdvisory, gotCreateAdvisory)
}
// same set of events should be received by AGG account
// on subjects containing account name (ACC.JS)
msg, err = subAgg.NextMsg(time.Second)
if err != nil {
t.Fatalf("Unexpected error: %v", err)
gotAPIAdvisory, gotCreateAdvisory = false, false
for i := 0; i < 2; i++ {
msg, err := subAgg.NextMsg(time.Second * 2)
if err != nil {
t.Fatalf("Unexpected error on AGG account: %v", err)
}
switch msg.Subject {
case "$JS.EVENT.ADVISORY.ACC.JS.STREAM.CREATED.ORDERS":
gotCreateAdvisory = true
case "$JS.EVENT.ADVISORY.ACC.JS.API":
gotAPIAdvisory = true
default:
t.Fatalf("Unexpected subject: %q", msg.Subject)
}
}
if msg.Subject != "$JS.EVENT.ADVISORY.ACC.JS.STREAM.CREATED.ORDERS" {
t.Fatalf("Unexpected subject: %q", msg.Subject)
}
// when using stream instead of service, we get all events
msg, err = subAgg.NextMsg(time.Second)
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
if msg.Subject != "$JS.EVENT.ADVISORY.ACC.JS.API" {
t.Fatalf("Unexpected subject: %q", msg.Subject)
if !gotAPIAdvisory || !gotCreateAdvisory {
t.Fatalf("Expected to have received both advisories on AGG account (API advisory %v, create advisory %v)", gotAPIAdvisory, gotCreateAdvisory)
}
}