mirror of
https://github.com/openclaw/openclaw.git
synced 2026-07-15 10:16:07 +00:00
* improve(pr): trust origin/main-matching wrappers when the canonical checkout is parked elsewhere * improve(crabbox): hint at lease expiry when reused-lease runs fail fast * fix(pr): pin the wrapper trust anchor to the remote-tracking ref
215 lines
9.3 KiB
TypeScript
215 lines
9.3 KiB
TypeScript
// PR wrapper tests cover maintainer helper command delegation.
|
|
import { spawnSync } from "node:child_process";
|
|
import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
|
import { tmpdir } from "node:os";
|
|
import { join } from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
|
|
function readScript(path: string): string {
|
|
return readFileSync(path, "utf8");
|
|
}
|
|
|
|
describe("scripts/pr wrappers", () => {
|
|
it("keeps the main PR helper usage and command table aligned", () => {
|
|
const script = readScript("scripts/pr");
|
|
|
|
expect(script).toContain("export NO_COLOR=1");
|
|
expect(script).toContain("unset COLORTERM");
|
|
expect(script).toContain('source "$script_parent_dir/lib/plain-gh.sh"');
|
|
expect(script).toContain("OPENCLAW_GH_BIN=");
|
|
expect(script).toContain("gh_plain");
|
|
expect(script).toContain("scripts/pr review-init <PR>");
|
|
expect(script).toContain("scripts/pr prepare-run <PR>");
|
|
expect(script).toContain("scripts/pr merge-run <PR>");
|
|
expect(script).toContain('review_init "$pr"');
|
|
expect(script).toContain('prepare_run "$pr"');
|
|
expect(script).toContain('merge_run "$pr"');
|
|
});
|
|
|
|
it("keeps merge wrapper modes delegated to the main PR helper", () => {
|
|
const script = readScript("scripts/pr-merge");
|
|
|
|
expect(script).toContain("scripts/pr-merge <PR>");
|
|
expect(script).toContain('exec "$base" merge-verify "$1"');
|
|
expect(script).toContain('exec "$base" merge-verify "$pr"');
|
|
expect(script).toContain('exec "$base" merge-run "$pr"');
|
|
});
|
|
|
|
it("defaults to squash and allows commit-preserving merge methods", () => {
|
|
const script = readScript("scripts/pr-lib/merge.sh");
|
|
|
|
expect(script).toContain("OPENCLAW_PR_MERGE_METHOD:-squash");
|
|
expect(script).toContain("--squash");
|
|
expect(script).toContain("--merge");
|
|
expect(script).toContain("--rebase");
|
|
expect(script).toContain('echo "Merged via $merge_label."');
|
|
});
|
|
|
|
it("keeps prepare wrapper modes delegated to the main PR helper", () => {
|
|
const script = readScript("scripts/pr-prepare");
|
|
|
|
expect(script).toContain("scripts/pr-prepare <init|validate-commit|gates|push|run> <PR>");
|
|
for (const mode of ["init", "validate-commit", "gates", "push", "run"]) {
|
|
expect(script).toContain(`${mode})`);
|
|
}
|
|
expect(script).toContain('exec "$base" prepare-init "$pr"');
|
|
expect(script).toContain('exec "$base" prepare-validate-commit "$pr"');
|
|
expect(script).toContain('exec "$base" prepare-gates "$pr"');
|
|
expect(script).toContain('exec "$base" prepare-push "$pr"');
|
|
expect(script).toContain('exec "$base" prepare-run "$pr"');
|
|
});
|
|
|
|
it("keeps review wrapper delegated to review-init", () => {
|
|
const script = readScript("scripts/pr-review");
|
|
|
|
expect(script).toContain('base="$script_dir/pr"');
|
|
expect(script).toContain('exec "$base" review-init "$@"');
|
|
});
|
|
|
|
it("refuses to substitute a different canonical wrapper implementation", () => {
|
|
const dir = mkdtempSync(join(tmpdir(), "openclaw-pr-wrapper-revision-"));
|
|
const repo = join(dir, "repo");
|
|
const linked = join(dir, "linked");
|
|
mkdirSync(join(repo, "scripts", "lib"), { recursive: true });
|
|
mkdirSync(join(repo, "scripts", "pr-lib"), { recursive: true });
|
|
writeFileSync(join(repo, "scripts", "pr"), readScript("scripts/pr"));
|
|
writeFileSync(join(repo, "scripts", "lib", "plain-gh.sh"), "# canonical\n");
|
|
writeFileSync(join(repo, "scripts", "pr-lib", "merge.sh"), "# canonical\n");
|
|
chmodSync(join(repo, "scripts", "pr"), 0o755);
|
|
|
|
const git = (cwd: string, args: string[]) =>
|
|
spawnSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
|
|
expect(git(repo, ["init", "-b", "main"]).status).toBe(0);
|
|
expect(git(repo, ["config", "user.name", "OpenClaw Test"]).status).toBe(0);
|
|
expect(git(repo, ["config", "user.email", "test@example.invalid"]).status).toBe(0);
|
|
expect(git(repo, ["add", "scripts"]).status).toBe(0);
|
|
expect(git(repo, ["commit", "-m", "test: canonical wrapper"]).status).toBe(0);
|
|
expect(git(repo, ["worktree", "add", "-b", "feature", linked]).status).toBe(0);
|
|
|
|
writeFileSync(join(linked, "scripts", "pr-lib", "merge.sh"), "# dirty linked\n");
|
|
const dirtyLinkedResult = spawnSync(join(linked, "scripts", "pr"), ["ls"], {
|
|
cwd: linked,
|
|
encoding: "utf8",
|
|
});
|
|
expect(dirtyLinkedResult.status).toBe(1);
|
|
expect(dirtyLinkedResult.stderr).toContain("scripts/pr wrapper files have uncommitted changes");
|
|
expect(git(linked, ["restore", "scripts/pr-lib/merge.sh"]).status).toBe(0);
|
|
|
|
// A dirty canonical checkout no longer blocks a linked worktree whose
|
|
// committed wrapper matches the origin/main trust anchor; without that
|
|
// anchor it must still refuse.
|
|
writeFileSync(join(repo, "scripts", "pr-lib", "merge.sh"), "# dirty canonical\n");
|
|
const dirtyResult = spawnSync(join(linked, "scripts", "pr"), ["ls"], {
|
|
cwd: linked,
|
|
encoding: "utf8",
|
|
});
|
|
expect(dirtyResult.status).toBe(1);
|
|
expect(dirtyResult.stderr).toContain(
|
|
"scripts/pr implementation differs between this worktree and the canonical checkout",
|
|
);
|
|
expect(git(repo, ["restore", "scripts/pr-lib/merge.sh"]).status).toBe(0);
|
|
|
|
writeFileSync(join(linked, "scripts", "pr-lib", "merge.sh"), "# linked\n");
|
|
expect(git(linked, ["add", "scripts/pr-lib/merge.sh"]).status).toBe(0);
|
|
expect(git(linked, ["commit", "-m", "test: linked wrapper"]).status).toBe(0);
|
|
|
|
const result = spawnSync(join(linked, "scripts", "pr"), ["ls"], {
|
|
cwd: linked,
|
|
encoding: "utf8",
|
|
});
|
|
rmSync(dir, { recursive: true, force: true });
|
|
|
|
expect(result.status).toBe(1);
|
|
expect(result.stderr).toContain(
|
|
"scripts/pr implementation differs between this worktree and the canonical checkout",
|
|
);
|
|
});
|
|
|
|
it("runs the local wrapper when it matches origin/main and the canonical checkout is parked elsewhere", () => {
|
|
const dir = mkdtempSync(join(tmpdir(), "openclaw-pr-wrapper-anchor-"));
|
|
const repo = join(dir, "repo");
|
|
const linked = join(dir, "linked");
|
|
mkdirSync(join(repo, "scripts", "lib"), { recursive: true });
|
|
mkdirSync(join(repo, "scripts", "pr-lib"), { recursive: true });
|
|
writeFileSync(join(repo, "scripts", "pr"), readScript("scripts/pr"));
|
|
writeFileSync(join(repo, "scripts", "lib", "plain-gh.sh"), "# canonical\n");
|
|
writeFileSync(join(repo, "scripts", "pr-lib", "merge.sh"), "# canonical\n");
|
|
chmodSync(join(repo, "scripts", "pr"), 0o755);
|
|
|
|
const git = (cwd: string, args: string[]) =>
|
|
spawnSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
|
|
expect(git(repo, ["init", "-b", "main"]).status).toBe(0);
|
|
expect(git(repo, ["config", "user.name", "OpenClaw Test"]).status).toBe(0);
|
|
expect(git(repo, ["config", "user.email", "test@example.invalid"]).status).toBe(0);
|
|
expect(git(repo, ["add", "scripts"]).status).toBe(0);
|
|
expect(git(repo, ["commit", "-m", "test: canonical wrapper"]).status).toBe(0);
|
|
// The linked worktree keeps main's wrapper; origin/main anchors trust.
|
|
expect(git(repo, ["update-ref", "refs/remotes/origin/main", "main"]).status).toBe(0);
|
|
expect(git(repo, ["worktree", "add", "-b", "feature", linked]).status).toBe(0);
|
|
|
|
// Park the canonical checkout on a release-style branch with a different
|
|
// wrapper revision, the exact contention that used to block landings.
|
|
expect(git(repo, ["switch", "-c", "release/test-train"]).status).toBe(0);
|
|
writeFileSync(join(repo, "scripts", "pr-lib", "merge.sh"), "# release drift\n");
|
|
expect(git(repo, ["add", "scripts/pr-lib/merge.sh"]).status).toBe(0);
|
|
expect(git(repo, ["commit", "-m", "test: release drift"]).status).toBe(0);
|
|
|
|
const result = spawnSync(join(linked, "scripts", "pr"), ["ls"], {
|
|
cwd: linked,
|
|
encoding: "utf8",
|
|
});
|
|
|
|
expect(result.stderr).not.toContain("Refusing to silently substitute");
|
|
expect(result.stderr).not.toContain("scripts/pr implementation differs");
|
|
expect(result.stderr).not.toContain("uncommitted changes");
|
|
|
|
// A local branch literally named "origin/main" must not spoof the trust
|
|
// anchor: only the remote-tracking ref counts.
|
|
expect(git(repo, ["update-ref", "-d", "refs/remotes/origin/main"]).status).toBe(0);
|
|
expect(git(repo, ["update-ref", "refs/heads/origin/main", "main"]).status).toBe(0);
|
|
const spoofed = spawnSync(join(linked, "scripts", "pr"), ["ls"], {
|
|
cwd: linked,
|
|
encoding: "utf8",
|
|
});
|
|
rmSync(dir, { recursive: true, force: true });
|
|
|
|
expect(spoofed.status).toBe(1);
|
|
expect(spoofed.stderr).toContain(
|
|
"scripts/pr implementation differs between this worktree and the canonical checkout",
|
|
);
|
|
});
|
|
|
|
it("verifies local GitHub auth through GraphQL when REST quota is unavailable", () => {
|
|
const dir = mkdtempSync(join(tmpdir(), "openclaw-pr-auth-"));
|
|
const gh = join(dir, "gh");
|
|
writeFileSync(
|
|
gh,
|
|
`#!/bin/sh
|
|
if [ "$1" = "api" ] && [ "$2" = "graphql" ]; then
|
|
printf 'monalisa\\n'
|
|
exit 0
|
|
fi
|
|
exit 1
|
|
`,
|
|
);
|
|
chmodSync(gh, 0o755);
|
|
|
|
const result = spawnSync(
|
|
"bash",
|
|
[
|
|
"-c",
|
|
"source scripts/lib/plain-gh.sh; source scripts/pr-lib/worktree.sh; ensure_gh_api_auth",
|
|
],
|
|
{
|
|
cwd: process.cwd(),
|
|
env: { ...process.env, OPENCLAW_GH_BIN: gh },
|
|
encoding: "utf8",
|
|
},
|
|
);
|
|
rmSync(dir, { recursive: true, force: true });
|
|
|
|
expect(result.status).toBe(0);
|
|
expect(result.stderr).toBe("");
|
|
});
|
|
});
|