more testing tweaking

Author: williamstein

src/packages/backend/conat/test/cluster/node-discovery.test.ts

@@ -9,6 +9,7 @@ import { createClusterNode } from "./util";
 
 beforeAll(before);
 
+jest.setTimeout(10000);
 describe("test automatic node discovery (and forgetting)", () => {
   const nodes: { client; server }[] = [];
   const clusterName = "auto";

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

@@ -18,6 +18,7 @@ import { delay } from "awaiting";
 export { delay };
 export { setDefaultTimeouts } from "@cocalc/conat/core/client";
 export { once } from "@cocalc/util/async-utils";
+import { until } from "@cocalc/util/async-utils";
 import { randomId } from "@cocalc/conat/names";
 import { isEqual } from "lodash";
 
@@ -169,8 +170,8 @@ export async function waitForConsistentState(
   }
 
   const start = Date.now();
-  await wait({
-    until: () => {
+  await until(
+    () => {
       for (let i = 0; i < servers.length; i++) {
         if (servers[i].state == "closed") {
           return true;
@@ -186,33 +187,50 @@ export async function waitForConsistentState(
               throw Error(`node ${j} is not connected to node ${i}`);
             }
             const x = link.interest.serialize().patterns;
+            const showInfo = () => {
+              console.log(
+                "server stream getAll: ",
+                // @ts-ignore
+                servers[i].clusterStreams.interest.stream.client.id,
+                // @ts-ignore
+                servers[i].clusterStreams.interest.stream.storage.path,
+                // @ts-ignore
+                servers[i].clusterStreams.interest.seqs(),
+                // @ts-ignore
+                //servers[i].clusterStreams.interest.getAll(),
+              );
+              console.log(
+                "link stream getAll: ",
+                // @ts-ignore
+                link.streams.interest.stream.client.id,
+                // @ts-ignore
+                link.streams.interest.stream.storage.path,
+                // @ts-ignore
+                link.streams.interest.seqs(),
+                // @ts-ignore
+                //link.streams.interest.getAll(),
+              );
+              console.log("waitForConsistentState", { i, j, a, x });
+            };
             if (!isEqual(a, x)) {
+              // @ts-ignore
+              const seqs0 = servers[i].clusterStreams.interest.seqs();
+              const seqs1 = link.streams.interest.seqs();
+              if (
+                !isEqual(
+                  seqs0.slice(0, seqs1.length),
+                  seqs1.slice(0, seqs0.length),
+                )
+              ) {
+                showInfo();
+                throw Error(`inconsistent initial sequences`);
+              }
+
               if (Date.now() - start > 3000) {
                 // likely going to fail
-                console.log(
-                  "server stream getAll: ",
-                  // @ts-ignore
-                  servers[i].clusterStreams.interest.stream.client.id,
-                  // @ts-ignore
-                  servers[i].clusterStreams.interest.stream.storage.path,
-                  // @ts-ignore
-                  servers[i].clusterStreams.interest.seqs(),
-                  // @ts-ignore
-                  //servers[i].clusterStreams.interest.getAll(),
-                );
-                console.log(
-                  "link stream getAll: ",
-                  // @ts-ignore
-                  link.streams.interest.stream.client.id,
-                  // @ts-ignore
-                  link.streams.interest.stream.storage.path,
-                  // @ts-ignore
-                  link.streams.interest.seqs(),
-                  // @ts-ignore
-                  //link.streams.interest.getAll(),
-                );
-                console.log("waitForConsistentState", { i, j, a, x });
+                showInfo();
               }
+
               // not yet equal
               return false;
             }
@@ -221,8 +239,8 @@ export async function waitForConsistentState(
       }
       return true;
     },
-    timeout,
-  });
+    { timeout },
+  );
 }
 
 export async function after() {

src/packages/backend/package.json

@@ -10,17 +10,15 @@
     "./auth/*": "./dist/auth/*.js",
     "./auth/tokens/*": "./dist/auth/tokens/*.js"
   },
-  "keywords": [
-    "utilities",
-    "cocalc"
-  ],
+  "keywords": ["utilities", "cocalc"],
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "clean": "rm -rf dist node_modules",
     "build": "pnpm exec tsc --build",
     "tsc": "pnpm exec tsc --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest --forceExit --maxWorkers=25%",
-    "test-conat": " pnpm exec jest --forceExit -maxWorkers=50% conat",
+    "test-conat": " pnpm exec jest --forceExit --maxWorkers=50% conat",
+    "stress-test": " pnpm exec jest --forceExit",
     "testp": "pnpm exec jest --forceExit",
     "depcheck": "pnpx depcheck --ignores events",
     "prepublishOnly": "pnpm test",
@@ -31,12 +29,7 @@
     "conat-persist": "DEBUG=cocalc:*  node ./bin/conat-persist.cjs",
     "conat-test-server": "node ./bin/conat-test-server.cjs"
   },
-  "files": [
-    "dist/**",
-    "bin/**",
-    "README.md",
-    "package.json"
-  ],
+  "files": ["dist/**", "bin/**", "README.md", "package.json"],
   "author": "SageMath, Inc.",
   "license": "SEE LICENSE.md",
   "dependencies": {