@zukhruf/testing 0.3.44 → 0.3.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +57 -49
- package/dist/databases/clickhouse.d.ts +2 -2
- package/dist/databases/clickhouse.d.ts.map +1 -1
- package/dist/databases/clickhouse.js +6 -5
- package/dist/databases/clickhouse.js.map +1 -1
- package/dist/databases/collector.d.ts +1 -2
- package/dist/databases/collector.d.ts.map +1 -1
- package/dist/databases/collector.js +2 -2
- package/dist/databases/collector.js.map +1 -1
- package/dist/databases/database.d.ts +2 -2
- package/dist/databases/database.d.ts.map +1 -1
- package/dist/databases/mysql-family-server.d.ts.map +1 -1
- package/dist/databases/mysql-family-server.js +14 -14
- package/dist/databases/mysql-family-server.js.map +1 -1
- package/dist/databases/postgres.d.ts.map +1 -1
- package/dist/databases/postgres.js +18 -15
- package/dist/databases/postgres.js.map +1 -1
- package/dist/databases/sqlserver.d.ts.map +1 -1
- package/dist/databases/sqlserver.js +19 -16
- package/dist/databases/sqlserver.js.map +1 -1
- package/dist/docker/directory.d.ts +2 -2
- package/dist/docker/directory.d.ts.map +1 -1
- package/dist/docker/directory.js +3 -3
- package/dist/docker/directory.js.map +1 -1
- package/dist/docker/host.d.ts +2 -2
- package/dist/docker/host.d.ts.map +1 -1
- package/dist/docker/host.js +5 -5
- package/dist/docker/host.js.map +1 -1
- package/dist/docker/index.d.ts +1 -2
- package/dist/docker/index.d.ts.map +1 -1
- package/dist/docker/index.js +1 -2
- package/dist/docker/index.js.map +1 -1
- package/dist/docker/{test-run.d.ts → run-records.d.ts} +22 -16
- package/dist/docker/run-records.d.ts.map +1 -0
- package/dist/docker/{test-run.js → run-records.js} +22 -27
- package/dist/docker/run-records.js.map +1 -0
- package/dist/docker/{fixtures.d.ts → testbed.d.ts} +30 -42
- package/dist/docker/testbed.d.ts.map +1 -0
- package/dist/docker/{fixtures.js → testbed.js} +81 -107
- package/dist/docker/testbed.js.map +1 -0
- package/dist/scripts/docker-global-setup.js +11 -10
- package/dist/scripts/docker-global-setup.js.map +1 -1
- package/dist/scripts/run-cleanup.d.ts +5 -1
- package/dist/scripts/run-cleanup.d.ts.map +1 -1
- package/dist/scripts/run-cleanup.js +33 -7
- package/dist/scripts/run-cleanup.js.map +1 -1
- package/package.json +2 -2
- package/dist/docker/fixtures.d.ts.map +0 -1
- package/dist/docker/fixtures.js.map +0 -1
- package/dist/docker/test-run.d.ts.map +0 -1
- package/dist/docker/test-run.js.map +0 -1
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DockerHost } from './host.ts';
|
|
2
|
-
import { type
|
|
2
|
+
import { type ProcessRun } from './run-records.ts';
|
|
3
3
|
/** A disposable fixture directory on the selected daemon's host filesystem. */
|
|
4
4
|
export declare class DockerDirectory implements AsyncDisposable {
|
|
5
5
|
#private;
|
|
6
6
|
readonly path: string;
|
|
7
7
|
readonly host: DockerHost;
|
|
8
8
|
private constructor();
|
|
9
|
-
static create(host: DockerHost, run:
|
|
9
|
+
static create(host: DockerHost, run: ProcessRun | undefined): Promise<DockerDirectory>;
|
|
10
10
|
private resolve;
|
|
11
11
|
mkdir(name: string): Promise<void>;
|
|
12
12
|
writeFile(name: string, content: string, mode?: number): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directory.d.ts","sourceRoot":"","sources":["../../src/docker/directory.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAS,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"directory.d.ts","sourceRoot":"","sources":["../../src/docker/directory.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAS,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAEpE,+EAA+E;AAC/E,qBAAa,eAAgB,YAAW,eAAe;;IACrD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAG1B,OAAO;WAUM,MAAM,CACjB,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,UAAU,GAAG,SAAS,GAC1B,OAAO,CAAC,eAAe,CAAC;IAS3B,OAAO,CAAC,OAAO;IAMT,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,SAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAarE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWvC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpD,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAM7C"}
|
package/dist/docker/directory.js
CHANGED
|
@@ -3,7 +3,7 @@ import { chmod, mkdir, readFile, rm, symlink, writeFile, } from 'node:fs/promise
|
|
|
3
3
|
import { tmpdir } from 'node:os';
|
|
4
4
|
import { join, posix } from 'node:path';
|
|
5
5
|
import { DockerHost, quote } from "./host.js";
|
|
6
|
-
import { directoryPrefix } from "./
|
|
6
|
+
import { directoryPrefix } from "./run-records.js";
|
|
7
7
|
/** A disposable fixture directory on the selected daemon's host filesystem. */
|
|
8
8
|
export class DockerDirectory {
|
|
9
9
|
path;
|
|
@@ -15,9 +15,9 @@ export class DockerDirectory {
|
|
|
15
15
|
this.#record = record;
|
|
16
16
|
}
|
|
17
17
|
static async create(host, run) {
|
|
18
|
-
const name = `${directoryPrefix(run)}${randomUUID()}`;
|
|
18
|
+
const name = `${directoryPrefix(run?.id)}${randomUUID()}`;
|
|
19
19
|
const path = host.remote ? `/tmp/${name}` : join(tmpdir(), name);
|
|
20
|
-
const record = await run?.record('directory', path);
|
|
20
|
+
const record = await run?.records.record('directory', path);
|
|
21
21
|
if (host.remote)
|
|
22
22
|
await host.shell(`mkdir -m 700 -- ${quote(path)}`);
|
|
23
23
|
else
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/docker/directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,KAAK,EACL,KAAK,EACL,QAAQ,EACR,EAAE,EACF,OAAO,EACP,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/docker/directory.ts"],"names":[],"mappings":"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"}
|
package/dist/docker/host.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Result } from 'nano-spawn';
|
|
2
|
-
import { type
|
|
2
|
+
import { type ProcessRun } from './run-records.ts';
|
|
3
3
|
export declare const quote: (value: string) => string;
|
|
4
4
|
/** How long one command in the SSH engine's remote shell may take. */
|
|
5
5
|
export declare const SHELL_TIMEOUT = 30000;
|
|
@@ -11,7 +11,7 @@ export declare const SHELL_TIMEOUT = 30000;
|
|
|
11
11
|
export declare class DockerHost {
|
|
12
12
|
#private;
|
|
13
13
|
readonly endpoint: string;
|
|
14
|
-
constructor(endpoint: string, run:
|
|
14
|
+
constructor(endpoint: string, run: ProcessRun | undefined);
|
|
15
15
|
get remote(): boolean;
|
|
16
16
|
sshArgs(options?: string[]): string[];
|
|
17
17
|
shell(script: string, input?: string): Promise<Result>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../src/docker/host.ts"],"names":[],"mappings":"AAKA,OAAgB,EACd,KAAK,MAAM,EAGZ,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../src/docker/host.ts"],"names":[],"mappings":"AAKA,OAAgB,EACd,KAAK,MAAM,EAGZ,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,UAAU,EAAiB,MAAM,kBAAkB,CAAC;AAElE,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,KAAG,MACC,CAAC;AAExC,sEAAsE;AACtE,eAAO,MAAM,aAAa,QAAS,CAAC;AAwBpC;;;;GAIG;AACH,qBAAa,UAAU;;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAGd,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,SAAS;IAUzD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,OAAO,CAAC,OAAO,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE;IAqBzC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUhD,OAAO,CACX,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC;CAmJzD"}
|
package/dist/docker/host.js
CHANGED
|
@@ -4,7 +4,7 @@ import { connect, createServer } from 'node:net';
|
|
|
4
4
|
import { join } from 'node:path';
|
|
5
5
|
import command, { SubprocessError, } from 'nano-spawn';
|
|
6
6
|
import { timebox } from "../async/timebox.js";
|
|
7
|
-
import { forwardPrefix } from "./
|
|
7
|
+
import { forwardPrefix } from "./run-records.js";
|
|
8
8
|
export const quote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
|
|
9
9
|
/** How long one command in the SSH engine's remote shell may take. */
|
|
10
10
|
export const SHELL_TIMEOUT = 30_000;
|
|
@@ -24,7 +24,7 @@ async function recorded(run, subprocess) {
|
|
|
24
24
|
// Node leaves pid undefined when the spawn failed: no process to record.
|
|
25
25
|
if (pid === undefined)
|
|
26
26
|
return subprocess;
|
|
27
|
-
await using _record = await run.recordProcess(pid);
|
|
27
|
+
await using _record = await run.records.recordProcess(pid);
|
|
28
28
|
return await subprocess;
|
|
29
29
|
}
|
|
30
30
|
/**
|
|
@@ -80,9 +80,9 @@ export class DockerHost {
|
|
|
80
80
|
try {
|
|
81
81
|
// Keep the Unix socket path below macOS's 104-byte limit. The private
|
|
82
82
|
// directory and ownership record also cover workers killed mid-test.
|
|
83
|
-
const directory = resources.use(await mkdtempDisposable(forwardPrefix(run)));
|
|
83
|
+
const directory = resources.use(await mkdtempDisposable(forwardPrefix(run?.id)));
|
|
84
84
|
if (run)
|
|
85
|
-
resources.use(await run.record('forward', directory.path));
|
|
85
|
+
resources.use(await run.records.record('forward', directory.path));
|
|
86
86
|
const path = join(directory.path, 's');
|
|
87
87
|
const sockets = new Set();
|
|
88
88
|
const server = createServer((socket) => {
|
|
@@ -140,7 +140,7 @@ export class DockerHost {
|
|
|
140
140
|
const child = await ssh.nodeChildProcess;
|
|
141
141
|
// Disposed after ssh has stopped.
|
|
142
142
|
if (run && child.pid !== undefined)
|
|
143
|
-
resources.use(await run.recordProcess(child.pid));
|
|
143
|
+
resources.use(await run.records.recordProcess(child.pid));
|
|
144
144
|
resources.defer(async () => {
|
|
145
145
|
child.stdin.end();
|
|
146
146
|
const deadline = setTimeout(() => child.kill('SIGKILL'), 1_000);
|
package/dist/docker/host.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../src/docker/host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAe,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,OAAO,EAAE,EAGd,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../src/docker/host.ts"],"names":[],"mappings":"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"}
|
package/dist/docker/index.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export { DockerDirectory } from './directory.ts';
|
|
2
|
-
export {
|
|
2
|
+
export { DockerTestbed, type DockerTestbedOptions, type ServiceOptions, } from './testbed.ts';
|
|
3
3
|
export { ServiceContainer } from './service-container.ts';
|
|
4
|
-
export { TestRun } from './test-run.ts';
|
|
5
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACL,aAAa,EACb,KAAK,oBAAoB,EACzB,KAAK,cAAc,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}
|
package/dist/docker/index.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export { DockerDirectory } from "./directory.js";
|
|
2
|
-
export {
|
|
2
|
+
export { DockerTestbed, } from "./testbed.js";
|
|
3
3
|
export { ServiceContainer } from "./service-container.js";
|
|
4
|
-
export { TestRun } from "./test-run.js";
|
|
5
4
|
//# sourceMappingURL=index.js.map
|
package/dist/docker/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACL,aAAa,GAGd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -5,21 +5,14 @@ export declare const TEST_RUN_DIRECTORY = "ZUKHRUF_TESTING_RUN_DIR";
|
|
|
5
5
|
/** The label that ties a container or volume to the run that created it. */
|
|
6
6
|
export declare const TEST_RUN_LABEL = "dev.zukhruf.testing.run";
|
|
7
7
|
/**
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
8
|
+
* The records of one `node --test` invocation with the Docker global setup,
|
|
9
|
+
* in the run's directory. While a recorded process lives, or a record of a
|
|
10
|
+
* path remains, the global teardown, or the recovery of a later run, keeps
|
|
11
|
+
* the run and removes what a killed process left.
|
|
12
12
|
*/
|
|
13
|
-
export declare class
|
|
14
|
-
readonly id: string;
|
|
13
|
+
export declare class RunRecords {
|
|
15
14
|
readonly directory: string;
|
|
16
|
-
constructor(
|
|
17
|
-
/**
|
|
18
|
-
* The run the global setup started this process in, read from the
|
|
19
|
-
* environment the host passes (`process.env`). Undefined outside a run.
|
|
20
|
-
*/
|
|
21
|
-
static fromEnvironment(environment: Readonly<Record<string, string | undefined>>): TestRun | undefined;
|
|
22
|
-
get labels(): Record<string, string>;
|
|
15
|
+
constructor(directory: string);
|
|
23
16
|
/**
|
|
24
17
|
* Writes a process record for `pid`, a test process or a command it
|
|
25
18
|
* started. While a recorded process lives, the run's records stay.
|
|
@@ -46,8 +39,21 @@ export declare class TestRun {
|
|
|
46
39
|
*/
|
|
47
40
|
record(kind: 'forward' | 'directory', path: string): Promise<AsyncDisposable>;
|
|
48
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* The run this process belongs to: its id marks what the process creates,
|
|
44
|
+
* its records keep the run while the process lives.
|
|
45
|
+
*/
|
|
46
|
+
export type ProcessRun = {
|
|
47
|
+
id: string;
|
|
48
|
+
records: RunRecords;
|
|
49
|
+
};
|
|
50
|
+
/**
|
|
51
|
+
* The run the global setup started this process in, read from the
|
|
52
|
+
* environment the host passes (`process.env`). Undefined outside a run.
|
|
53
|
+
*/
|
|
54
|
+
export declare function readRun(environment: Readonly<Record<string, string | undefined>>): ProcessRun | undefined;
|
|
49
55
|
/** The name prefix of a host directory that a run's test process created. */
|
|
50
|
-
export declare const directoryPrefix: (
|
|
56
|
+
export declare const directoryPrefix: (id: string | undefined) => string;
|
|
51
57
|
/** The path prefix of the private directory behind an SSH port forward. */
|
|
52
|
-
export declare const forwardPrefix: (
|
|
53
|
-
//# sourceMappingURL=
|
|
58
|
+
export declare const forwardPrefix: (id: string | undefined) => string;
|
|
59
|
+
//# sourceMappingURL=run-records.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-records.d.ts","sourceRoot":"","sources":["../../src/docker/run-records.ts"],"names":[],"mappings":"AAKA,0EAA0E;AAC1E,eAAO,MAAM,WAAW,2BAA2B,CAAC;AACpD,+EAA+E;AAC/E,eAAO,MAAM,kBAAkB,4BAA4B,CAAC;AAC5D,4EAA4E;AAC5E,eAAO,MAAM,cAAc,4BAA4B,CAAC;AAKxD;;;;;GAKG;AACH,qBAAa,UAAU;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;gBAEf,SAAS,EAAE,MAAM;IAI7B;;;;;OAKG;IACG,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAM1D;;;;OAIG;IACH,iBAAiB,IAAI,IAAI;IASzB;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC;IAMhD;;;OAGG;IACG,MAAM,CACV,IAAI,EAAE,SAAS,GAAG,WAAW,EAC7B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,eAAe,CAAC;CAK5B;AAED;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,UAAU,CAAA;CAAE,CAAC;AAE7D;;;GAGG;AACH,wBAAgB,OAAO,CACrB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,GACxD,UAAU,GAAG,SAAS,CASxB;AAED,6EAA6E;AAC7E,eAAO,MAAM,eAAe,GAAI,IAAI,MAAM,GAAG,SAAS,KAAG,MACf,CAAC;AAE3C,2EAA2E;AAC3E,eAAO,MAAM,aAAa,GAAI,IAAI,MAAM,GAAG,SAAS,KAAG,MACA,CAAC"}
|
|
@@ -11,34 +11,16 @@ export const TEST_RUN_LABEL = 'dev.zukhruf.testing.run';
|
|
|
11
11
|
/** The run directories that hold a process record of this process. */
|
|
12
12
|
const recordedRuns = new Set();
|
|
13
13
|
/**
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
14
|
+
* The records of one `node --test` invocation with the Docker global setup,
|
|
15
|
+
* in the run's directory. While a recorded process lives, or a record of a
|
|
16
|
+
* path remains, the global teardown, or the recovery of a later run, keeps
|
|
17
|
+
* the run and removes what a killed process left.
|
|
18
18
|
*/
|
|
19
|
-
export class
|
|
20
|
-
id;
|
|
19
|
+
export class RunRecords {
|
|
21
20
|
directory;
|
|
22
|
-
constructor(
|
|
23
|
-
this.id = id;
|
|
21
|
+
constructor(directory) {
|
|
24
22
|
this.directory = directory;
|
|
25
23
|
}
|
|
26
|
-
/**
|
|
27
|
-
* The run the global setup started this process in, read from the
|
|
28
|
-
* environment the host passes (`process.env`). Undefined outside a run.
|
|
29
|
-
*/
|
|
30
|
-
static fromEnvironment(environment) {
|
|
31
|
-
const id = environment[TEST_RUN_ID];
|
|
32
|
-
const directory = environment[TEST_RUN_DIRECTORY];
|
|
33
|
-
if (id === undefined && directory === undefined)
|
|
34
|
-
return undefined;
|
|
35
|
-
if (!id || !directory)
|
|
36
|
-
throw new Error(`The global setup sets ${TEST_RUN_ID} and ${TEST_RUN_DIRECTORY} together, but only one of them is set`);
|
|
37
|
-
return new TestRun(id, directory);
|
|
38
|
-
}
|
|
39
|
-
get labels() {
|
|
40
|
-
return { [TEST_RUN_LABEL]: this.id };
|
|
41
|
-
}
|
|
42
24
|
/**
|
|
43
25
|
* Writes a process record for `pid`, a test process or a command it
|
|
44
26
|
* started. While a recorded process lives, the run's records stay.
|
|
@@ -82,8 +64,21 @@ export class TestRun {
|
|
|
82
64
|
return { [Symbol.asyncDispose]: () => rm(file, { force: true }) };
|
|
83
65
|
}
|
|
84
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* The run the global setup started this process in, read from the
|
|
69
|
+
* environment the host passes (`process.env`). Undefined outside a run.
|
|
70
|
+
*/
|
|
71
|
+
export function readRun(environment) {
|
|
72
|
+
const id = environment[TEST_RUN_ID];
|
|
73
|
+
const directory = environment[TEST_RUN_DIRECTORY];
|
|
74
|
+
if (id === undefined && directory === undefined)
|
|
75
|
+
return undefined;
|
|
76
|
+
if (!id || !directory)
|
|
77
|
+
throw new Error(`The global setup sets ${TEST_RUN_ID} and ${TEST_RUN_DIRECTORY} together, but only one of them is set`);
|
|
78
|
+
return { id, records: new RunRecords(directory) };
|
|
79
|
+
}
|
|
85
80
|
/** The name prefix of a host directory that a run's test process created. */
|
|
86
|
-
export const directoryPrefix = (
|
|
81
|
+
export const directoryPrefix = (id) => `zukhruf-testing-${id ?? 'standalone'}-`;
|
|
87
82
|
/** The path prefix of the private directory behind an SSH port forward. */
|
|
88
|
-
export const forwardPrefix = (
|
|
89
|
-
//# sourceMappingURL=
|
|
83
|
+
export const forwardPrefix = (id) => `/tmp/zukhruf-testing-forward-${id ?? 'standalone'}-`;
|
|
84
|
+
//# sourceMappingURL=run-records.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-records.js","sourceRoot":"","sources":["../../src/docker/run-records.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,65 +1,46 @@
|
|
|
1
|
-
import { Docker, type Environment, type ExecResult, type OwnedContainer, type OwnedVolume } from '@zukhruf/docker';
|
|
1
|
+
import { Docker, type EngineApi, type Environment, type ExecResult, type OwnedContainer, type OwnedVolume } from '@zukhruf/docker';
|
|
2
2
|
import { DockerDirectory } from './directory.ts';
|
|
3
3
|
import { ServiceContainer } from './service-container.ts';
|
|
4
4
|
/** Marks a server that `reuse()` shares across processes and runs. */
|
|
5
5
|
export declare const SHARED_SERVER_LABEL = "dev.zukhruf.testing.shared";
|
|
6
6
|
/** The fingerprint of a shared server's configuration. */
|
|
7
7
|
export declare const CONFIG_LABEL = "dev.zukhruf.testing.config";
|
|
8
|
-
/**
|
|
9
|
-
export
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
readOnly?: boolean;
|
|
14
|
-
}
|
|
15
|
-
export interface ContainerOptions {
|
|
16
|
-
image: string;
|
|
17
|
-
/** Replaces the image's command. */
|
|
18
|
-
command?: string[];
|
|
19
|
-
/** A dedicated container gets a generated name; a reused server's name comes from its configuration. */
|
|
20
|
-
name?: string;
|
|
21
|
-
hostname?: string;
|
|
22
|
-
env?: Record<string, string>;
|
|
23
|
-
labels?: Record<string, string> | undefined;
|
|
24
|
-
mounts?: Mount[];
|
|
25
|
-
/** `<path>[:<options>]`, as `docker run --tmpfs` takes it. */
|
|
26
|
-
tmpfs?: string[];
|
|
27
|
-
ipcHost?: boolean;
|
|
28
|
-
/** A size in the Docker CLI's binary units, such as `512m` or `1g`. */
|
|
29
|
-
memory?: string;
|
|
30
|
-
cpus?: number;
|
|
31
|
-
memorySwappiness?: number;
|
|
32
|
-
}
|
|
33
|
-
export interface ServiceOptions extends ContainerOptions {
|
|
8
|
+
/** The version of this package that a shared server belongs to (ADR 0012). */
|
|
9
|
+
export declare const VERSION_LABEL = "dev.zukhruf.testing.version";
|
|
10
|
+
/** The version of this package: `../../package.json` from `src/docker` and from `dist/docker`. */
|
|
11
|
+
export declare const PACKAGE_VERSION: string;
|
|
12
|
+
export interface ServiceOptions {
|
|
34
13
|
/** The container's port that answers on 127.0.0.1 of this machine. */
|
|
35
14
|
internalPort: number;
|
|
15
|
+
/** Without it, the engine names a dedicated server; a shared server's name comes from its configuration. */
|
|
16
|
+
name?: string;
|
|
36
17
|
/** Runs on every acquisition. Throw until ready, using timebox for polling. */
|
|
37
18
|
healthy?: (service: ServiceContainer) => unknown;
|
|
38
19
|
}
|
|
39
|
-
export interface
|
|
20
|
+
export interface DockerTestbedOptions {
|
|
40
21
|
/** The environment of this process, such as `process.env`: it selects the engine and the run. */
|
|
41
22
|
environment: Environment;
|
|
42
23
|
}
|
|
43
24
|
/**
|
|
44
|
-
*
|
|
25
|
+
* A testbed of containers on the engine that `environment` selects. The engine is
|
|
45
26
|
* connected on the first acquisition and kept: handles keep the engine they
|
|
46
27
|
* were made on. Docker owns cross-process coordination; this instance holds
|
|
47
28
|
* no server cache.
|
|
48
29
|
*/
|
|
49
|
-
export declare class
|
|
30
|
+
export declare class DockerTestbed {
|
|
50
31
|
#private;
|
|
51
|
-
constructor({ environment }:
|
|
32
|
+
constructor({ environment }: DockerTestbedOptions);
|
|
52
33
|
/**
|
|
53
34
|
* Defaults for disposable test containers, including external launchers.
|
|
54
35
|
* A launcher creates with these labels and no acquisition of this class:
|
|
55
36
|
* the read records this process, so the global teardown sweeps the run.
|
|
56
37
|
*/
|
|
57
38
|
get defaults(): {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
39
|
+
Labels: Record<string, string>;
|
|
40
|
+
HostConfig: {
|
|
41
|
+
Memory: number;
|
|
42
|
+
NanoCpus: number;
|
|
61
43
|
};
|
|
62
|
-
labels: Record<string, string>;
|
|
63
44
|
};
|
|
64
45
|
/** The client of the engine that this instance's handles are on. */
|
|
65
46
|
client(): Promise<Docker>;
|
|
@@ -68,17 +49,24 @@ export declare class DockerFixtures {
|
|
|
68
49
|
/** Creates a named volume. Its run's cleanup removes it if this process dies first. */
|
|
69
50
|
volume(): Promise<OwnedVolume>;
|
|
70
51
|
/** Starts a container this process owns. It stays after it stops, until disposal removes it. */
|
|
71
|
-
start(
|
|
72
|
-
|
|
73
|
-
|
|
52
|
+
start(body: EngineApi.ContainerCreateRequest, options?: {
|
|
53
|
+
name?: string;
|
|
54
|
+
}): Promise<OwnedContainer>;
|
|
55
|
+
/**
|
|
56
|
+
* Starts a dedicated server. Failure or disposal removes it. A server that
|
|
57
|
+
* is not ready rejects with its container's output, read before the removal.
|
|
58
|
+
*/
|
|
59
|
+
serve(body: EngineApi.ContainerCreateRequest, options: ServiceOptions): Promise<ServiceContainer>;
|
|
74
60
|
/**
|
|
75
61
|
* Reuse one server per configuration on this engine, across processes and
|
|
76
62
|
* runs. Docker reserves the name atomically. Readiness failure leaves it
|
|
77
63
|
* running. Disposal closes only the forward; the server keeps running for
|
|
78
|
-
* its other users.
|
|
64
|
+
* its other users. The engine removes the server when it stops.
|
|
79
65
|
*/
|
|
80
|
-
reuse(options: ServiceOptions): Promise<ServiceContainer>;
|
|
66
|
+
reuse(body: EngineApi.ContainerCreateRequest, options: ServiceOptions): Promise<ServiceContainer>;
|
|
81
67
|
/** Runs a container to completion and gives its output and exit code. The container is removed afterwards. */
|
|
82
|
-
run(
|
|
68
|
+
run(body: EngineApi.ContainerCreateRequest, options?: {
|
|
69
|
+
name?: string;
|
|
70
|
+
}): Promise<ExecResult>;
|
|
83
71
|
}
|
|
84
|
-
//# sourceMappingURL=
|
|
72
|
+
//# sourceMappingURL=testbed.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testbed.d.ts","sourceRoot":"","sources":["../../src/docker/testbed.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,MAAM,EACN,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,UAAU,EAEf,KAAK,cAAc,EACnB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,sEAAsE;AACtE,eAAO,MAAM,mBAAmB,+BAA+B,CAAC;AAChE,0DAA0D;AAC1D,eAAO,MAAM,YAAY,+BAA+B,CAAC;AACzD,8EAA8E;AAC9E,eAAO,MAAM,aAAa,gCAAgC,CAAC;AAE3D,kGAAkG;AAClG,eAAO,MAAiB,eAAe,QAEtC,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,4GAA4G;IAC5G,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+EAA+E;IAC/E,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC;CAClD;AAED,MAAM,WAAW,oBAAoB;IACnC,iGAAiG;IACjG,WAAW,EAAE,WAAW,CAAC;CAC1B;AAgCD;;;;;GAKG;AACH,qBAAa,aAAa;;gBAsBZ,EAAE,WAAW,EAAE,EAAE,oBAAoB;IAKjD;;;;OAIG;IACH,IAAI,QAAQ,IAAI;QACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,UAAU,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;KAClD,CAMA;IAED,oEAAoE;IAC9D,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,gDAAgD;IAC1C,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC;IAI3C,uFAAuF;IACjF,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC;IAQpC,gGAAgG;IAC1F,KAAK,CACT,IAAI,EAAE,SAAS,CAAC,sBAAsB,EACtC,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1B,OAAO,CAAC,cAAc,CAAC;IAS1B;;;OAGG;IACG,KAAK,CACT,IAAI,EAAE,SAAS,CAAC,sBAAsB,EACtC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAuB5B;;;;;OAKG;IACG,KAAK,CACT,IAAI,EAAE,SAAS,CAAC,sBAAsB,EACtC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAkD5B,8GAA8G;IACxG,GAAG,CACP,IAAI,EAAE,SAAS,CAAC,sBAAsB,EACtC,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1B,OAAO,CAAC,UAAU,CAAC;CAsFvB"}
|