oldschoola
a2854ba768
Migrate 203 test files (356 call sites) from fs.rm/fs.rmSync to
removeWithRetries/removeSyncWithRetries to reduce EBUSY test failures
on Windows. removeWithRetries is now exported from @oh-my-pi/pi-utils.
The migration uses a regex-based approach that:
- Replaces fs.rm(path, { recursive, force }) → removeWithRetries(path)
- Replaces fs.rmSync(path, { recursive, force }) → removeSyncWithRetries(path)
- Replaces fs.rm(path) → removeWithRetries(path) (no options)
- Skips fs.rm/fs.rmSync inside template literals (bun --eval scripts)
- Adds imports to existing @oh-my-pi/pi-utils import or creates new one
- Removes unused fs imports where fs.rm was the only fs usage (4 files)
54 lines
2.2 KiB
TypeScript
54 lines
2.2 KiB
TypeScript
import { afterAll, beforeAll, describe, expect, it } from "bun:test";
|
||
import * as fs from "node:fs";
|
||
import * as os from "node:os";
|
||
import * as path from "node:path";
|
||
import { resolveUpdateMethodForTest } from "@oh-my-pi/pi-coding-agent/cli/update-cli";
|
||
import { removeSyncWithRetries } from "@oh-my-pi/pi-utils";
|
||
|
||
// Issue #845: on Windows with Bun installed via Scoop, ~/.bun is a junction
|
||
// to scoop\persist\Oven-sh.Bun\.bun. `bun pm bin -g` and the omp path that
|
||
// $which finds may end up referring to the same directory through different
|
||
// path strings (one through the junction, one through the real target).
|
||
// `isPathInDirectory` did purely lexical comparison via path.resolve, which
|
||
// does not follow filesystem links, so it misclassified Bun-installed omp
|
||
// as "binary" and tried to swap omp.exe in place – which fails on Windows
|
||
// because Bun has the file open (EPERM on unlink of .bak).
|
||
//
|
||
// We reproduce the realpath-resolution bug with a symlink (works on macOS /
|
||
// Linux; the bug is realpath, not junction-specific).
|
||
|
||
describe("issue-845: resolveUpdateMethod follows symlinks/junctions", () => {
|
||
let tmpRoot: string;
|
||
let realBinDir: string;
|
||
let linkedBinDir: string;
|
||
let ompPathViaLink: string;
|
||
|
||
beforeAll(() => {
|
||
tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "omp-issue-845-"));
|
||
realBinDir = path.join(tmpRoot, "real", "bin");
|
||
fs.mkdirSync(realBinDir, { recursive: true });
|
||
fs.writeFileSync(path.join(realBinDir, "omp"), "#!/bin/sh\n", { mode: 0o755 });
|
||
|
||
linkedBinDir = path.join(tmpRoot, "link-bin");
|
||
fs.symlinkSync(realBinDir, linkedBinDir, "dir");
|
||
ompPathViaLink = path.join(linkedBinDir, "omp");
|
||
});
|
||
|
||
afterAll(() => {
|
||
removeSyncWithRetries(tmpRoot);
|
||
});
|
||
|
||
it("classifies omp reached through a symlinked bin dir as bun-managed", () => {
|
||
// $which resolves through the symlink, `bun pm bin -g` returns the real path
|
||
// (or vice versa). Either direction must be recognized.
|
||
const method = resolveUpdateMethodForTest(ompPathViaLink, realBinDir);
|
||
expect(method).toBe("bun");
|
||
});
|
||
|
||
it("classifies omp at the real bin dir as bun-managed when bunBinDir is symlinked", () => {
|
||
const ompAtReal = path.join(realBinDir, "omp");
|
||
const method = resolveUpdateMethodForTest(ompAtReal, linkedBinDir);
|
||
expect(method).toBe("bun");
|
||
});
|
||
});
|