Skip to content
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

Jump to bottom

fix #8868 #9327

Merged
merged 1 commit into from Mar 9, 2024
Merged

fix #8868 #9327

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/bun.js/test/expect.zig
View file
Open in desktop
Expand Up @@ -187,11 +187,13 @@ pub const Expect = struct {
promise.setHandled(vm);

const now = std.time.Instant.now() catch unreachable;
const elapsed = if (Jest.runner.?.pending_test) |pending_test| @divFloor(now.since(pending_test.started_at), std.time.ns_per_ms) else 0;
const remaining = @as(u32, @truncate(Jest.runner.?.last_test_timeout_timer_duration -| elapsed));
const remaining = if (Jest.runner) |runner| remaining: {
const elapsed = if (runner.pending_test) |pending_test| @divFloor(now.since(pending_test.started_at), std.time.ns_per_ms) else 0;
break :remaining @as(u32, @truncate(runner.last_test_timeout_timer_duration -| elapsed));
} else std.math.maxInt(u32);

if (!globalThis.bunVM().waitForPromiseWithTimeout(promise, remaining)) {
if (Jest.runner.?.pending_test) |pending_test|
if (Jest.runner) |runner| if (runner.pending_test) |pending_test|
pending_test.timeout();
return null;
}
Expand Down