vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-06-25 22:09:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(release): forward-port 2026.6.9 closeout fixes

Browse Source
This commit is contained in:
Vincent Koc
2026-06-21 12:52:32 +08:00
parent 7b28b73e78
commit 0f8df48a91
4 changed files with 177 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/scripts/test-install-sh-docker.test.ts
View File

@@ -1,7 +1,8 @@
// Test Install Sh Docker tests cover test install sh docker script behavior.
import { spawn, spawnSync } from "node:child_process";
import { existsSync, readFileSync } from "node:fs";
import path from "node:path";
import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
import { tmpdir } from "node:os";
import path, { join } from "node:path";
import { runInNewContext } from "node:vm";
import { afterEach, describe, expect, it } from "vitest";
import { createTempDirTracker } from "../helpers/temp-dir.js";
@@ -103,6 +104,36 @@ function runDefaultSmokePlatform(env: Record<string, string>, hostArch: string):
return result.stdout;
}
function extractInstallE2eAgentJsonParser(): string {
const script = readFileSync(INSTALL_E2E_RUNNER_PATH, "utf8");
const match = script.match(
/node - <<'NODE' "\$out_json"\n([\s\S]*?)\nNODE\n\}\n\nRUN_AGENT_TURN_BG_PID/u,
);
if (!match) {
throw new Error("install E2E agent JSON parser was not found");
}
return match[1];
}
function normalizeInstallE2eAgentOutput(output: string) {
const root = mkdtempSync(join(tmpdir(), "openclaw-install-e2e-agent-output-"));
const outputPath = join(root, "agent.json");
writeFileSync(outputPath, output, "utf8");
try {
const result = spawnSync(process.execPath, ["-", outputPath], {
encoding: "utf8",
input: extractInstallE2eAgentJsonParser(),
});
return {
output: readFileSync(outputPath, "utf8"),
status: result.status,
stderr: result.stderr,
};
} finally {
rmSync(root, { force: true, recursive: true });
}
}
async function waitForCondition(
predicate: () => boolean,
label: string,
@@ -329,7 +360,9 @@ describe("test-install-sh-docker", () => {
expect(script).toContain('source "$ROOT_DIR/scripts/lib/host-timeout.sh"');
expect(script).toContain('DOCKER_PULL_TIMEOUT="${OPENCLAW_DOCKER_SETUP_PULL_TIMEOUT:-600s}"');
expect(script).toContain("run_docker_pull()");
expect(script).toContain('openclaw_host_timeout_cmd "$DOCKER_PULL_TIMEOUT" docker pull "$image"');
expect(script).toContain(
'openclaw_host_timeout_cmd "$DOCKER_PULL_TIMEOUT" docker pull "$image"',
);
expect(timeoutHelper).toContain("elif command -v gtimeout >/dev/null 2>&1; then");
expect(timeoutHelper).toContain('"$timeout_bin" --kill-after=30s "$timeout_value" "$@"');
expect(script).toContain('run_docker_pull "$IMAGE_NAME"');
@@ -587,6 +620,22 @@ describe("install-sh E2E runner", () => {
expect(script).toContain('\\"timeoutSeconds\\":${OPENAI_PROVIDER_TIMEOUT_SECONDS}');
});
it("normalizes agent JSON when structured lifecycle diagnostics follow the result", () => {
const payload = {
result: {
payloads: [{ text: "LEFT=RED RIGHT=GREEN" }],
},
replayInvalid: true,
};
const result = normalizeInstallE2eAgentOutput(
`${JSON.stringify(payload, null, 2)}\n[agent] ${JSON.stringify({ stopReason: "stop" })}\n`,
);
expect(result.status).toBe(0);
expect(result.stderr).toBe("");
expect(JSON.parse(result.output)).toEqual(payload);
});
it.each([
["turn timeout", "OPENCLAW_INSTALL_E2E_AGENT_TURN_TIMEOUT_SECONDS", "300s"],
["provider timeout", "OPENCLAW_INSTALL_E2E_OPENAI_PROVIDER_TIMEOUT_SECONDS", "1e3"],