Commit 1ac2dcf

committed

Prevent fs.rm from erroring about non-existent files

We were using fs.rmdir which presumably did not have the same behavior in v14 (in v16 fs.rmdir also errors).

1 parent e346fe2 commit 1ac2dcfCopy full SHA for 1ac2dcf

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ export class SocketProxyProvider {`
`77`	`77`	`this.proxyPipe = pipe`
`78`	`78`	`return Promise.all([`
`79`	`79`	`fs.mkdir(path.dirname(this.proxyPipe), { recursive: true }),`
`80`		`- fs.rm(this.proxyPipe, { recursive: true }),`
	`80`	`+ fs.rm(this.proxyPipe, { force: true,recursive: true }),`
`81`	`81`	`])`
`82`	`82`	`})`
`83`	`83`	`.then(() => {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ describe("cli", () => {`
`458`	`458`
`459`	`459`	`beforeEach(async () => {`
`460`	`460`	`delete process.env.VSCODE_IPC_HOOK_CLI`
`461`		`- await fs.rm(vscodeIpcPath, { recursive: true })`
	`461`	`+ await fs.rm(vscodeIpcPath, { force: true,recursive: true })`
`462`	`462`	`})`
`463`	`463`
`464`	`464`	`it("should use existing if inside code-server", async () => {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ describe("SocketProxyProvider", () => {`
`53`	`53`
`54`	`54`	`await fs.mkdir(path.join(tmpdir, "tests"), { recursive: true })`
`55`	`55`	`const socketPath = await provider.findFreeSocketPath(path.join(tmpdir, "tests/tls-socket-proxy"))`
`56`		`- await fs.rm(socketPath, { recursive: true })`
	`56`	`+ await fs.rm(socketPath, { force: true,recursive: true })`
`57`	`57`
`58`	`58`	`return new Promise<void>((_resolve) => {`
`59`	`59`	`const resolved: { [key: string]: boolean } = { client: false, server: false }`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export function mockLogger() {`
`29`	`29`	`*/`
`30`	`30`	`export async function clean(testName: string): Promise<void> {`
`31`	`31`	const dir = path.join(os.tmpdir(), `code-server/tests/${testName}`)
`32`		`- await fs.rm(dir, { recursive: true })`
	`32`	`+ await fs.rm(dir, { force: true,recursive: true })`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`

Comments

(0)