[FIX] [TEST] cross account test environment to allow acks to cross (#374

)
nats-io · Sep 28, 2022 · 8426af1 · 8426af1
1 parent cdee523
commit 8426af1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/tests/jetstream_test.ts b/tests/jetstream_test.ts
@@ -1490,15 +1490,23 @@ Deno.test("jetstream - cross account subscribe", async () => {
   const js = nc.jetstream({ apiPrefix: "IPA" });
 
   const opts = bo.getOpts();
+  const acks: Promise<boolean>[] = [];
+  const d = deferred();
   const sub = await js.subscribe(subj, opts);
   await (async () => {
     for await (const m of sub) {
-      m.ack();
+      acks.push(m.ackAck());
+      if (m.seq === 2) {
+        d.resolve();
+      }
     }
   })();
+  await d;
+  await Promise.all(acks);
   const ci = await sub.consumerInfo();
   assertEquals(ci.num_pending, 0);
   assertEquals(ci.delivered.stream_seq, 2);
+  assertEquals(ci.ack_floor.stream_seq, 2);
   await sub.destroy();
   await assertRejects(
     async () => {

diff --git a/tests/jsm_test.ts b/tests/jsm_test.ts
@@ -1743,7 +1743,7 @@ Deno.test("jsm - discard_new_per_subject option", async () => {
     "discard new per subject requires discard new policy to be set",
   );
 
-  let si = await jsm.streams.add({
+  const si = await jsm.streams.add({
     name: "KV_A",
     discard: DiscardPolicy.New,
     discard_new_per_subject: true,

diff --git a/tests/jstest_util.ts b/tests/jstest_util.ts
@@ -33,15 +33,17 @@ export function jetstreamExportServerConf(
       JS: {
         jetstream: "enabled",
         users: [{ user: "js", password: "js" }],
-        exports: [{ service: "$JS.API.>" }, {
-          stream: "A.>",
-          accounts: ["A"],
-        }],
+        exports: [
+          { service: "$JS.API.>" },
+          { service: "$JS.ACK.>" },
+          { stream: "A.>", accounts: ["A"] },
+        ],
       },
       A: {
         users: [{ user: "a", password: "s3cret" }],
         imports: [
           { service: { subject: "$JS.API.>", account: "JS" }, to: prefix },
+          { service: { subject: "$JS.ACK.>", account: "JS" } },
           { stream: { subject: "A.>", account: "JS" } },
         ],
       },