cxx-tests: upgrade to execa 9.x

yoursunny · May 12, 2024 · 8029cb0 · 8029cb0
1 parent 724e510
commit 8029cb0
Show file tree

Hide file tree

Showing 29 changed files with 82 additions and 60 deletions.
diff --git a/integ/browser-tests/package.json b/integ/browser-tests/package.json
@@ -27,10 +27,10 @@
     "@types/webpack": "^5.28.5",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "html-webpack-plugin": "^5.6.0",
-    "puppeteer": "^22.7.1",
+    "puppeteer": "^22.8.0",
     "ts-loader": "^9.5.1",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4"

diff --git a/integ/cxx-tests/package.json b/integ/cxx-tests/package.json
@@ -14,6 +14,7 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "execa": "^8.0.1"
+    "execa": "^9.0.2",
+    "streaming-iterables": "^8.0.1"
   }
 }
diff --git a/integ/cxx-tests/test-fixture/cxxprogram.ts b/integ/cxx-tests/test-fixture/cxxprogram.ts
@@ -1,29 +1,43 @@
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 
-import { execa, type ExecaChildProcess, execaSync, type Options as ExecaOptions } from "execa";
+import { execa, type Options } from "execa";
 
-const pathOfMakefile = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-
-function compile(dir: string) {
-  const rel = path.relative(pathOfMakefile, dir);
-  execaSync("make", [`${rel}/a.out`], { cwd: pathOfMakefile, stderr: "inherit" });
-}
+const pathOfMakefile = path.resolve(import.meta.dirname, "..");
 
 /**
- * Compile and invoke the C++ program in test case directory.
- * @param importMetaUrl - `import.meta.url` of calling test case.
- * @param args - Arguments to the compiled program.
- * @param opts - execa options.
+ * Compile the C++ program in test case directory.
+ * @param dir - `import.meta.dirname` of calling test case.
+ * @returns Executable full path.
  */
-export function execute(importMetaUrl: string, args: readonly string[] = [],
-    opts: ExecaOptions = {}): ExecaChildProcess {
-  const dir = path.dirname(fileURLToPath(importMetaUrl));
-  compile(dir);
-  return execa("./a.out", args, {
-    cwd: dir,
+export async function compile(dir: string): Promise<Executable> {
+  const rel = path.relative(pathOfMakefile, dir);
+  await execa("make", [`${rel}/a.out`], {
+    cwd: pathOfMakefile,
     stderr: "inherit",
-    ...opts,
-    env: { NDN_NAME_ALT_URI: "0", ...opts.env },
   });
+  return new Executable(path.join(dir, "a.out"));
 }
+
+class Executable {
+  constructor(public readonly exe: string) {}
+
+  /**
+   * Invoke the executable.
+   * @param args - Command line arguments.
+   * @param opts - Execa options.
+   * @returns Execa subprocess.
+   */
+  public run<Opts extends Options>(args: readonly string[], opts: Opts) {
+    return execa(this.exe, args, {
+      ...baseOpts,
+      ...opts,
+      env: { ...baseOpts.env, ...opts?.env },
+    });
+  }
+}
+
+const baseOpts = {
+  lines: true,
+  stderr: "inherit",
+  env: { NDN_NAME_ALT_URI: "0" },
+} as const satisfies Options;
diff --git a/integ/cxx-tests/tests/keychain/cert/test.t.ts b/integ/cxx-tests/tests/keychain/cert/test.t.ts
@@ -3,9 +3,11 @@ import { Component, ValidityPeriod } from "@ndn/packet";
 import { Encoder } from "@ndn/tlv";
 import { expect, test } from "vitest";
 
-import { execute } from "../../../test-fixture/cxxprogram";
+import * as cxx from "../../../test-fixture/cxxprogram";
 
 test("decode", async () => {
+  const exe = await cxx.compile(import.meta.dirname);
+
   const [, publicKey] = await generateSigningKey("/A");
   const [issuerPrivateKey] = await generateSigningKey("/B");
 
@@ -18,9 +20,10 @@ test("decode", async () => {
   });
   const certName = CertNaming.parseCertName(cert.name);
 
-  const { stdout } = await execute(import.meta.url, [], { input: Buffer.from(Encoder.encode(cert.data)) });
-  const [name, identity, keyId, issuerId, validityNotBefore, validityNotAfter] =
-    stdout.split("\n");
+  const { stdout } = await exe.run([], {
+    input: Buffer.from(Encoder.encode(cert.data)),
+  });
+  const [name, identity, keyId, issuerId, validityNotBefore, validityNotAfter] = stdout;
   expect(name).toBe(cert.name.toString());
   expect(identity).toBe(certName.subjectName.toString());
   expect(keyId).toBe(certName.keyId.toString());

diff --git a/integ/cxx-tests/tests/keychain/verify/test.t.ts b/integ/cxx-tests/tests/keychain/verify/test.t.ts
@@ -4,7 +4,7 @@ import { Encoder } from "@ndn/tlv";
 import { makeTmpDir } from "@ndn/util/test-fixture/tmp";
 import { expect, test } from "vitest";
 
-import { execute } from "../../../test-fixture/cxxprogram";
+import * as cxx from "../../../test-fixture/cxxprogram";
 
 type Row<G> = [
   desc: string,
@@ -18,6 +18,8 @@ const TABLE = ([] as Array<Row<any>>).concat(
 );
 
 test.each(TABLE)("%s", async (desc, algo, genParam) => {
+  const exe = await cxx.compile(import.meta.dirname);
+
   void desc;
   const [privateKey, publicKey] = await generateSigningKey("/A", algo, genParam);
   const cert = await Certificate.selfSign({ privateKey, publicKey });
@@ -28,9 +30,9 @@ test.each(TABLE)("%s", async (desc, algo, genParam) => {
   using tmpDir = makeTmpDir();
   const certFile = tmpDir.createFile(Encoder.encode(cert.data));
   const packetFile = tmpDir.createFile(Encoder.encode(packet));
-  const { stdout } = await execute(import.meta.url, [certFile, packetFile]);
+  const { stdout } = await exe.run([certFile, packetFile], {});
 
-  const [certOk, packetOk] = stdout.split("\n");
+  const [certOk, packetOk] = stdout;
   expect(certOk).toBe("1");
   expect(packetOk).toBe("1");
 });
diff --git a/integ/cxx-tests/tests/sync/psync-full/test.t.ts b/integ/cxx-tests/tests/sync/psync-full/test.t.ts
@@ -4,7 +4,7 @@ import { FullSync, makePSyncCompatParam, type SyncUpdate } from "@ndn/psync";
 import { Closers, delay } from "@ndn/util";
 import { afterEach, expect, test, vi } from "vitest";
 
-import { execute } from "../../../test-fixture/cxxprogram";
+import * as cxx from "../../../test-fixture/cxxprogram";
 
 const syncPrefix = new Name("/sync");
 const userA = new Name("/userA");
@@ -15,9 +15,11 @@ const closers = new Closers();
 afterEach(closers.close);
 
 test("simple", async () => {
+  const exe = await cxx.compile(import.meta.dirname);
+
   await using nfd = await new FakeNfd().open();
 
-  const p = execute(import.meta.url, [`${nfd.port}`, `${syncPrefix}`, `${userA}`]);
+  const p = exe.run([`${nfd.port}`, `${syncPrefix}`, `${userA}`], {});
   await nfd.waitNFaces(1);
 
   const sync = new FullSync({
@@ -48,7 +50,7 @@ test("simple", async () => {
   p.kill("SIGINT");
   const { stdout } = await p;
   const hiSeqNums = new Map<string, number>();
-  for (const line of stdout.split("\n")) {
+  for (const line of stdout) {
     const [user, , hiSeqNum] = line.split("\t") as [string, string, string];
     hiSeqNums.set(user, Number.parseInt(hiSeqNum, 10));
   }

diff --git a/mk/package.json b/mk/package.json
@@ -8,7 +8,7 @@
     "js-yaml": "^4.1.0",
     "readlink": "^3.0.0",
     "split2": "^4.2.0",
-    "type-fest": "^4.18.1"
+    "type-fest": "^4.18.2"
   },
   "dependencies": {
     "compare-versions": "6.1.0"

diff --git a/package.json b/package.json
@@ -13,11 +13,11 @@
     "test": "vitest",
     "typedoc": "bash mk/typedoc.sh"
   },
-  "packageManager": "pnpm@9.1.0-0+sha256.c557b24d2298d9b5e3be7086ebf55a28253b008324d545f72645a6de89844102",
+  "packageManager": "pnpm@9.1.0+sha256.22e36fba7f4880ecf749a5ca128b8435da085ecd49575e7fb9e64d6bf4fad394",
   "devDependencies": {
-    "@types/node": "^20.12.8",
+    "@types/node": "^20.12.11",
     "@types/wtfnode": "^0.7.3",
-    "@typescript/lib-dom": "npm:@types/web@0.0.143",
+    "@typescript/lib-dom": "npm:@types/web@0.0.144",
     "@vitest/coverage-v8": "^1.6.0",
     "@yoursunny/xo-config": "0.58.0",
     "codedown": "^3.1.0",

diff --git a/pkg/autoconfig/package.json b/pkg/autoconfig/package.json
@@ -41,6 +41,6 @@
     "@types/default-gateway": "^7.2.2",
     "@types/koa": "^2.15.0",
     "koa": "^2.15.3",
-    "type-fest": "^4.18.1"
+    "type-fest": "^4.18.2"
   }
 }
diff --git a/pkg/cli-common/package.json b/pkg/cli-common/package.json
@@ -33,7 +33,7 @@
     "@ndn/packet": "workspace:*",
     "@ndn/util": "workspace:*",
     "dotenv": "^16.4.5",
-    "env-var": "^7.4.1",
+    "env-var": "^7.4.2",
     "tslib": "^2.6.2",
     "wtfnode": "^0.9.2"
   }

diff --git a/pkg/dpdkmgmt/package.json b/pkg/dpdkmgmt/package.json
@@ -29,7 +29,7 @@
     "@ndn/node-transport": "workspace:*",
     "@ndn/packet": "workspace:*",
     "graphql": "^16.8.1",
-    "graphql-request": "^6.1.0",
+    "graphql-request": "^7.0.0",
     "tslib": "^2.6.2"
   },
   "optionalDependencies": {

diff --git a/pkg/keychain-cli/package.json b/pkg/keychain-cli/package.json
@@ -32,7 +32,7 @@
     "@ndn/repo": "workspace:*",
     "@ndn/tlv": "workspace:*",
     "@ndn/util": "workspace:*",
-    "env-var": "^7.4.1",
+    "env-var": "^7.4.2",
     "fast-chunk-string": "^1.0.1",
     "get-stdin": "^9.0.0",
     "nodemailer": "^6.9.13",

diff --git a/pkg/keychain/package.json b/pkg/keychain/package.json
@@ -35,7 +35,7 @@
     "idb-keyval": "^6.2.1",
     "mnemonist": "^0.39.8",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "wait-your-turn": "^1.0.1"
   },
   "devDependencies": {

diff --git a/pkg/l3face/package.json b/pkg/l3face/package.json
@@ -36,7 +36,7 @@
     "retry": "^0.13.1",
     "streaming-iterables": "^8.0.1",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "typescript-event-target": "^1.1.1"
   }
 }
diff --git a/pkg/nac/package.json b/pkg/nac/package.json
@@ -37,7 +37,7 @@
     "@yoursunny/asn1": "0.0.20200718",
     "mnemonist": "^0.39.8",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1"
+    "type-fest": "^4.18.2"
   },
   "devDependencies": {
     "@ndn/l3face": "workspace:^",

diff --git a/pkg/ndncert/package.json b/pkg/ndncert/package.json
@@ -41,7 +41,7 @@
     "nodemailer": "^6.9.13",
     "p-timeout": "^6.1.2",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "typescript-event-target": "^1.1.1"
   },
   "devDependencies": {

diff --git a/pkg/ndnsec/package.json b/pkg/ndnsec/package.json
@@ -30,7 +30,7 @@
     "@ndn/tlv": "workspace:*",
     "@ndn/util": "workspace:*",
     "@yoursunny/asn1": "0.0.20200718",
-    "execa": "^8.0.1",
+    "execa": "^9.0.2",
     "tslib": "^2.6.2"
   }
 }
diff --git a/pkg/nfdmgmt/package.json b/pkg/nfdmgmt/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "@ndn/l3face": "workspace:*",
     "@ndn/node-transport": "workspace:*",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "typescript-event-target": "^1.1.1"
   }
 }
diff --git a/pkg/node-transport/package.json b/pkg/node-transport/package.json
@@ -28,7 +28,7 @@
     "event-iterator": "^2.0.0",
     "p-event": "^6.0.1",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "url-format-lax": "^2.0.0",
     "url-parse-lax": "^5.0.0"
   },

diff --git a/pkg/packet/package.json b/pkg/packet/package.json
@@ -31,7 +31,7 @@
     "buffer-compare": "^1.1.1",
     "mnemonist": "^0.39.8",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1"
+    "type-fest": "^4.18.2"
   },
   "devDependencies": {
     "@types/buffer-compare": "^0.0.33"

diff --git a/pkg/pyrepo/package.json b/pkg/pyrepo/package.json
@@ -37,7 +37,7 @@
     "p-defer": "^4.0.1",
     "streaming-iterables": "^8.0.1",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "typescript-event-target": "^1.1.1"
   },
   "devDependencies": {
@@ -46,7 +46,7 @@
     "@ndn/ndnsec": "workspace:^",
     "@ndn/nfdmgmt": "workspace:^",
     "@types/netmask": "^2.0.5",
-    "execa": "^8.0.1",
+    "execa": "^9.0.2",
     "netmask": "^2.0.2"
   }
 }
diff --git a/pkg/pyrepo/test-fixture/pyrepo.ts b/pkg/pyrepo/test-fixture/pyrepo.ts
@@ -7,7 +7,7 @@ import { NdnsecKeyChain } from "@ndn/ndnsec";
 import { FakeNfd } from "@ndn/nfdmgmt/test-fixture/prefix-reg";
 import { Name, type NameLike } from "@ndn/packet";
 import { assert, Closers } from "@ndn/util";
-import { execa, type ExecaChildProcess, execaSync } from "execa";
+import { execa, execaSync, type ResultPromise } from "execa";
 import { long2ip } from "netmask";
 
 let pyrepoInstalled: boolean | undefined;
@@ -62,7 +62,7 @@ export class PyRepo implements AsyncDisposable {
   }
 
   private constructor(
-      private readonly p: ExecaChildProcess,
+      private readonly p: ResultPromise,
       private readonly nfd: FakeNfd,
   ) {}
 

diff --git a/pkg/repo-api/package.json b/pkg/repo-api/package.json
@@ -43,6 +43,6 @@
   "devDependencies": {
     "@ndn/node-transport": "workspace:*",
     "stream-mock": "^2.0.5",
-    "type-fest": "^4.18.1"
+    "type-fest": "^4.18.2"
   }
 }
diff --git a/pkg/repo/package.json b/pkg/repo/package.json
@@ -37,7 +37,7 @@
     "memory-level": "^1.0.0",
     "streaming-iterables": "^8.0.1",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "typescript-event-target": "^1.1.1",
     "wait-your-turn": "^1.0.1"
   },

diff --git a/pkg/segmented-object/package.json b/pkg/segmented-object/package.json
@@ -45,6 +45,6 @@
     "@ndn/l3face": "workspace:*",
     "@ndn/repo-api": "workspace:*",
     "stream-mock": "^2.0.5",
-    "type-fest": "^4.18.1"
+    "type-fest": "^4.18.2"
   }
 }
diff --git a/pkg/svs/package.json b/pkg/svs/package.json
@@ -37,7 +37,7 @@
     "@ndn/util": "workspace:*",
     "streaming-iterables": "^8.0.1",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "typescript-event-target": "^1.1.1"
   },
   "devDependencies": {

diff --git a/pkg/tlv/package.json b/pkg/tlv/package.json
@@ -29,6 +29,6 @@
     "@ndn/util": "workspace:*",
     "mnemonist": "^0.39.8",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1"
+    "type-fest": "^4.18.2"
   }
 }
diff --git a/pkg/trust-schema/package.json b/pkg/trust-schema/package.json
@@ -35,7 +35,7 @@
     "mnemonist": "^0.39.8",
     "obliterator": "^2.0.4",
     "tslib": "^2.6.2",
-    "type-fest": "^4.18.1"
+    "type-fest": "^4.18.2"
   },
   "devDependencies": {
     "@ndn/l3face": "workspace:^",