author | JW Wang <jwwang@mozilla.com> |
Mon, 31 Jul 2017 10:35:47 +0800 | |
changeset 371939 | 3bcd8efdd376d4d3dfcc5dda64631f048417c661 |
parent 371938 | 6df0dd7948ada7f73e7583d10d35778419bc038d |
child 371940 | 140171ba59ecab3326002a269b21e25d1b1b64c0 |
push id | 47627 |
push user | jwwang@mozilla.com |
push date | Mon, 31 Jul 2017 06:02:33 +0000 |
treeherder | autoland@3bcd8efdd376 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | gerald |
bugs | 1385751 |
milestone | 56.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/media/test/manifest.js +++ b/dom/media/test/manifest.js @@ -1689,17 +1689,18 @@ function MediaTestManager() { this.handlers[token] = handler; var onTimeout = () => { this.hasTimeout = true; ok(false, `${token} timed out!`); this.finished(token); }; // Default timeout to 180s for each test. - this.timers[token] = setTimeout(onTimeout, 180000); + // Call SimpleTest._originalSetTimeout() to bypass the flaky timeout checker. + this.timers[token] = SimpleTest._originalSetTimeout.call(window, onTimeout, 180000); is(this.numTestsRunning, this.tokens.length, "[started " + token + " t=" + elapsedTime(this.startTime) + "] Length of array should match number of running tests"); } // Registers that the test corresponding to 'token' has finished. Call when // you've finished your test. If all tests are complete this will finish the // run, otherwise it may start up the next run. It's ok to call multiple times