Merge remote-tracking branch 'upstream/main' into aeisenberg/ff-refactoring

This commit is contained in:
Andrew Eisenberg 2022-10-12 08:36:16 -07:00
commit 34d48f825c
29 changed files with 185 additions and 89 deletions

View file

@ -523,3 +523,18 @@ test("withTimeout on short task", async (t) => {
t.deepEqual(shortTaskTimedOut, false);
t.deepEqual(result, 99);
});
test("withTimeout doesn't call callback if promise resolves", async (t) => {
let shortTaskTimedOut = false;
const shortTask = new Promise((resolve) => {
setTimeout(() => {
resolve(99);
}, shortTime);
});
const result = await util.withTimeout(100, shortTask, () => {
shortTaskTimedOut = true;
});
await new Promise((r) => setTimeout(r, 200));
t.deepEqual(shortTaskTimedOut, false);
t.deepEqual(result, 99);
});