mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-24 15:14:27 +00:00
fix: repair ci audit and type drift
This commit is contained in:
@@ -43,24 +43,6 @@ function resolveStartupEntryPath(env: Record<string, string>) {
|
||||
);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
async function withWindowsEnv(
|
||||
run: (params: { tmpDir: string; env: Record<string, string> }) => Promise<void>,
|
||||
) {
|
||||
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-win-startup-"));
|
||||
const env = {
|
||||
USERPROFILE: tmpDir,
|
||||
APPDATA: path.join(tmpDir, "AppData", "Roaming"),
|
||||
OPENCLAW_PROFILE: "default",
|
||||
OPENCLAW_GATEWAY_PORT: "18789",
|
||||
};
|
||||
try {
|
||||
await run({ tmpDir, env });
|
||||
} finally {
|
||||
await fs.rm(tmpDir, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
async function writeGatewayScript(env: Record<string, string>, port = 18789) {
|
||||
const scriptPath = resolveTaskScriptPath(env);
|
||||
await fs.mkdir(path.dirname(scriptPath), { recursive: true });
|
||||
@@ -75,27 +57,6 @@ async function writeGatewayScript(env: Record<string, string>, port = 18789) {
|
||||
"utf8",
|
||||
);
|
||||
}
|
||||
|
||||
||||||| parent of 8fb2c3f894 (refactor: share windows daemon test fixtures)
|
||||
async function withWindowsEnv(
|
||||
run: (params: { tmpDir: string; env: Record<string, string> }) => Promise<void>,
|
||||
) {
|
||||
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-win-startup-"));
|
||||
const env = {
|
||||
USERPROFILE: tmpDir,
|
||||
APPDATA: path.join(tmpDir, "AppData", "Roaming"),
|
||||
OPENCLAW_PROFILE: "default",
|
||||
OPENCLAW_GATEWAY_PORT: "18789",
|
||||
};
|
||||
try {
|
||||
await run({ tmpDir, env });
|
||||
} finally {
|
||||
await fs.rm(tmpDir, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> 8fb2c3f894 (refactor: share windows daemon test fixtures)
|
||||
beforeEach(() => {
|
||||
resetSchtasksBaseMocks();
|
||||
spawn.mockClear();
|
||||
@@ -232,7 +193,7 @@ describe("Windows startup fallback", () => {
|
||||
});
|
||||
|
||||
it("kills the Startup fallback runtime even when the CLI env omits the gateway port", async () => {
|
||||
await withWindowsEnv(async ({ env }) => {
|
||||
await withWindowsEnv("openclaw-win-startup-", async ({ env }) => {
|
||||
schtasksResponses.push({ code: 0, stdout: "", stderr: "" });
|
||||
await writeGatewayScript(env);
|
||||
await fs.mkdir(path.dirname(resolveStartupEntryPath(env)), { recursive: true });
|
||||
|
||||
@@ -88,7 +88,7 @@ describe("Scheduled Task stop/restart cleanup", () => {
|
||||
});
|
||||
|
||||
it("force-kills remaining busy port listeners when the first stop pass does not free the port", async () => {
|
||||
await withWindowsEnv(async ({ env }) => {
|
||||
await withWindowsEnv("openclaw-win-stop-", async ({ env }) => {
|
||||
await writeGatewayScript(env);
|
||||
schtasksResponses.push(
|
||||
{ code: 0, stdout: "", stderr: "" },
|
||||
|
||||
Reference in New Issue
Block a user