Skip to content

std: Restore file locking test on Windows #7299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2020
Merged

std: Restore file locking test on Windows #7299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions lib/std/fs/test.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,11 +741,6 @@ test "open file with exclusive lock twice, make sure it waits" {
return error.SkipZigTest;
}

if (std.Target.current.os.tag == .windows) {
// https://github.com/ziglang/zig/issues/7010
return error.SkipZigTest;
}

const filename = "file_lock_test.txt";

var tmp = tmpDir(.{});
Expand All @@ -770,13 +765,17 @@ test "open file with exclusive lock twice, make sure it waits" {
defer t.wait();

const SLEEP_TIMEOUT_NS = 10 * std.time.ns_per_ms;

std.time.sleep(SLEEP_TIMEOUT_NS);
// Make sure we've slept enough.
var timer = try std.time.Timer.start();
while (true) {
std.time.sleep(SLEEP_TIMEOUT_NS);
if (timer.read() >= SLEEP_TIMEOUT_NS) break;
}
// Check that createFile is still waiting for the lock to be released.
testing.expect(!evt.isSet());
file.close();
// Generous timeout to avoid failures on heavily loaded systems.
try evt.timedWait(SLEEP_TIMEOUT_NS);
// No timeout to avoid failures on heavily loaded systems.
evt.wait();
}

test "open file with exclusive nonblocking lock twice (absolute paths)" {
Expand Down