refactor sticky tests

Author: williamstein

src/packages/backend/conat/test/supercluster/cluster-sticky.test.ts

@@ -0,0 +1,68 @@
+import { before, after, wait } from "@cocalc/backend/conat/test/setup";
+import { STICKY_QUEUE_GROUP } from "@cocalc/conat/core/client";
+import { createCluster } from "./util";
+
+beforeAll(before);
+
+describe("create cluster of two nodes, and verify that *sticky* subs properly work", () => {
+  let server1, server2, client1, client1b, client2;
+  it("create two distinct servers and link them", async () => {
+    ({ server: server1, client: client1 } = await createCluster({
+      systemAccountPassword: "squeamish",
+    }));
+    client1b = server1.client();
+    ({ server: server2, client: client2 } = await createCluster({
+      systemAccountPassword: "ossifrage",
+    }));
+    await server1.addSuperclusterLink({
+      client: client2,
+      clusterName: server2.clusterName,
+    });
+    await server2.addSuperclusterLink({
+      client: client1,
+      clusterName: server1.clusterName,
+    });
+  });
+
+  let sub1, sub1b;
+  let recv1 = 0,
+    recv1b = 0;
+  const subject = "5077.org";
+  it("make two subscriptions with the same sticky queue group", async () => {
+    sub1 = await client1.sub(subject, { queue: STICKY_QUEUE_GROUP });
+    (async () => {
+      for await (const _ of sub1) {
+        recv1++;
+      }
+    })();
+    sub1b = await client1b.sub(subject, { queue: STICKY_QUEUE_GROUP });
+    (async () => {
+      for await (const _ of sub1b) {
+        recv1b++;
+      }
+    })();
+  });
+
+  let count = 50;
+  it("send messages and note they all go to the same target -- first the easy sanity check all on the same node", async () => {
+    await client1.waitForInterest(subject);
+    for (let i = 0; i < count; i++) {
+      await client1.publish(subject, "hi");
+    }
+    await wait({ until: () => recv1 + recv1b >= count });
+    expect(recv1 + recv1b).toEqual(count);
+    expect(recv1 * recv1b).toEqual(0);
+  });
+
+  it("send messages and note they all go to the same target -- next the hard case across the cluster", async () => {
+    await client2.waitForInterest(subject);
+    for (let i = 0; i < count; i++) {
+      await client2.publish(subject, "hi");
+    }
+    await wait({ until: () => recv1 + recv1b >= 2 * count });
+    expect(recv1 + recv1b).toEqual(2 * count);
+    expect(recv1 * recv1b).toEqual(0);
+  });
+});
+
+afterAll(after);

src/packages/backend/conat/test/supercluster/supercluster.test.ts

@@ -5,38 +5,18 @@ pnpm test `pwd`/supercluster.test.ts
 
 */
 
-import {
-  before,
-  after,
-  initConatServer,
-  once,
-  delay,
-  wait,
-} from "@cocalc/backend/conat/test/setup";
+import { before, after, delay, once, wait } from "@cocalc/backend/conat/test/setup";
 import {
   superclusterLink,
   superclusterStreams,
   superclusterService,
   trimSuperclusterStreams,
 } from "@cocalc/conat/core/supercluster";
 import { isEqual } from "lodash";
-import { STICKY_QUEUE_GROUP } from "@cocalc/conat/core/client";
+import { createCluster } from "./util";
 
 beforeAll(before);
 
-let clusterName = 0;
-async function createCluster(opts?) {
-  clusterName += 1;
-  const server = await initConatServer({
-    clusterName: `${clusterName}`,
-    id: "0",
-    systemAccountPassword: "foo",
-    ...opts,
-  });
-  const client = server.client();
-  return { server, client };
-}
-
 describe("create a supercluster enabled socketio server and test that the streams update as they should", () => {
   let server, client;
   it("create a server with supercluster support enabled", async () => {
@@ -391,65 +371,4 @@ describe("test trimming the interest stream", () => {
   });
 });
 
-describe.only("create cluster of two nodes, and verify that *sticky* subs properly work", () => {
-  let server1, server2, client1, client1b, client2;
-  it("create two distinct servers and link them", async () => {
-    ({ server: server1, client: client1 } = await createCluster({
-      systemAccountPassword: "squeamish",
-    }));
-    client1b = server1.client();
-    ({ server: server2, client: client2 } = await createCluster({
-      systemAccountPassword: "ossifrage",
-    }));
-    await server1.addSuperclusterLink({
-      client: client2,
-      clusterName: server2.clusterName,
-    });
-    await server2.addSuperclusterLink({
-      client: client1,
-      clusterName: server1.clusterName,
-    });
-  });
-
-  let sub1, sub1b;
-  let recv1 = 0,
-    recv1b = 0;
-  const subject = "5077.org";
-  it("make two subscriptions with the same sticky queue group", async () => {
-    sub1 = await client1.sub(subject, { queue: STICKY_QUEUE_GROUP });
-    (async () => {
-      for await (const _ of sub1) {
-        recv1++;
-      }
-    })();
-    sub1b = await client1b.sub(subject, { queue: STICKY_QUEUE_GROUP });
-    (async () => {
-      for await (const _ of sub1b) {
-        recv1b++;
-      }
-    })();
-  });
-
-  let count = 50;
-  it("send messages and note they all go to the same target -- first the easy sanity check all on the same node", async () => {
-    await client1.waitForInterest(subject);
-    for (let i = 0; i < count; i++) {
-      await client1.publish(subject, "hi");
-    }
-    await wait({ until: () => recv1 + recv1b >= count });
-    expect(recv1 + recv1b).toEqual(count);
-    expect(recv1 * recv1b).toEqual(0);
-  });
-
-  it("send messages and note they all go to the same target -- next the hard case across the cluster", async () => {
-    await client2.waitForInterest(subject);
-    for (let i = 0; i < count; i++) {
-      await client2.publish(subject, "hi");
-    }
-    await wait({ until: () => recv1 + recv1b >= 2 * count });
-    expect(recv1 + recv1b).toEqual(2 * count);
-    expect(recv1 * recv1b).toEqual(0);
-  });
-});
-
 afterAll(after);

src/packages/backend/conat/test/supercluster/util.ts

@@ -0,0 +1,14 @@
+import { initConatServer } from "@cocalc/backend/conat/test/setup";
+
+let clusterName = 0;
+export async function createCluster(opts?) {
+  clusterName += 1;
+  const server = await initConatServer({
+    clusterName: `${clusterName}`,
+    id: "0",
+    systemAccountPassword: "foo",
+    ...opts,
+  });
+  const client = server.client();
+  return { server, client };
+}