Bug 965644 - Fix intermittent oranges on promise tests. r=bz

This commit is contained in:
Nikhil Marathe 2014-07-01 17:33:00 -07:00
parent 9d8bb6e323
commit f42a07f1f7
2 changed files with 26 additions and 10 deletions

View File

@ -202,15 +202,23 @@ function promiseRacePromiseArray() {
}
var arr = [
timeoutPromise(50),
timeoutPromise(20),
timeoutPromise(30),
timeoutPromise(100)
new Promise(function(resolve) {
resolve("first");
}),
Promise.resolve("second"),
new Promise(function() {}),
new Promise(function(resolve) {
setTimeout(function() {
setTimeout(function() {
resolve("fourth");
}, 0);
}, 0);
}),
];
var p = Promise.race(arr);
p.then(function(winner) {
is(winner, 20, "Fastest timeout should win.");
is(winner, "first", "First queued resolution should win the race.");
runTest();
});
}

View File

@ -565,15 +565,23 @@ function promiseRacePromiseArray() {
}
var arr = [
timeoutPromise(50),
timeoutPromise(20),
timeoutPromise(30),
timeoutPromise(100)
new Promise(function(resolve) {
resolve("first");
}),
Promise.resolve("second"),
new Promise(function() {}),
new Promise(function(resolve) {
setTimeout(function() {
setTimeout(function() {
resolve("fourth");
}, 0);
}, 0);
}),
];
var p = Promise.race(arr);
p.then(function(winner) {
is(winner, 20, "Fastest timeout should win.");
is(winner, "first", "First queued resolution should win the race.");
runTest();
});
}