Skip to content

Commit 1a455b2

Browse files
xEgoistVexu
authored andcommitted
test: Fix windows_spawn tmp directory cleanup
On Windows, a directory that's set as the current working directory is not allowed to be removed. This can cause error on `deleteTree` if the CWD is set to the file to be removed and will cause `error.FileBusy`. However, due to `tmp.cleanup()` ignoring the errors, the folder removal error will be ignored. The only test violating this is `windows_spawn`. As a solution, setting the parent directory to be the CWD before deletion will allow the cleanup to pass.
1 parent 396bd51 commit 1a455b2

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

lib/std/fs/test.zig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,3 +1434,18 @@ test "delete a read-only file on windows" {
14341434
file.close();
14351435
try tmp.dir.deleteFile("test_file");
14361436
}
1437+
1438+
test "delete a setAsCwd directory on Windows" {
1439+
if (builtin.os.tag != .windows) return error.SkipZigTest;
1440+
1441+
var tmp = tmpDir(.{});
1442+
// Set tmp dir as current working directory.
1443+
try tmp.dir.setAsCwd();
1444+
tmp.dir.close();
1445+
try testing.expectError(error.FileBusy, tmp.parent_dir.deleteTree(&tmp.sub_path));
1446+
// Now set the parent dir as the current working dir for clean up.
1447+
try tmp.parent_dir.setAsCwd();
1448+
try tmp.parent_dir.deleteTree(&tmp.sub_path);
1449+
// Close the parent "tmp" so we don't leak the HANDLE.
1450+
tmp.parent_dir.close();
1451+
}

test/standalone/windows_spawn/main.zig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ pub fn main() anyerror!void {
116116

117117
// Now let's set the tmp dir as the cwd and set the path only include the "something" sub dir
118118
try tmp.dir.setAsCwd();
119+
defer tmp.parent_dir.setAsCwd() catch {};
119120
const something_subdir_abs_path = try std.mem.concatWithSentinel(allocator, u16, &.{ tmp_absolute_path_w, utf16Literal("\\something") }, 0);
120121
defer allocator.free(something_subdir_abs_path);
121122

0 commit comments

Comments
 (0)