From 88f4fc7a77888d925f84257ffd30a88e1bfd45da Mon Sep 17 00:00:00 2001 From: "Nils Ohlmeier [:drno]" Date: Thu, 3 Apr 2014 18:11:00 +0200 Subject: [PATCH] Bug 989047 - increase canplaythrough timeouts to accomodate B2G slowness. r=jesup --- dom/media/tests/mochitest/mediaStreamPlayback.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dom/media/tests/mochitest/mediaStreamPlayback.js b/dom/media/tests/mochitest/mediaStreamPlayback.js index bd76ea9f557e..73600dbdc6b4 100644 --- a/dom/media/tests/mochitest/mediaStreamPlayback.js +++ b/dom/media/tests/mochitest/mediaStreamPlayback.js @@ -2,7 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -var TIMEOUT_LENGTH = 10000; +const TIMEUPDATE_TIMEOUT_LENGTH = 10000; +const ENDED_TIMEOUT_LENGTH = 10000; + +/* Time we wait for the canplaythrough event to fire + * Note: this needs to be at least 30s because the + * B2G emulator in VMs is really slow. */ +const CANPLAYTHROUGH_TIMEOUT_LENGTH = 60000; /** * This class manages playback of a HTMLMediaElement with a MediaStream. @@ -123,7 +129,7 @@ MediaStreamPlayback.prototype = { timeUpdateCallback, false); onError("timeUpdate event never fired"); } - }, TIMEOUT_LENGTH); + }, TIMEUPDATE_TIMEOUT_LENGTH); }; // Adds a listener intended to be fired when playback is available @@ -142,7 +148,7 @@ MediaStreamPlayback.prototype = { canPlayThroughCallback, false); onError("canplaythrough event never fired"); } - }, TIMEOUT_LENGTH); + }, CANPLAYTHROUGH_TIMEOUT_LENGTH); }, /** @@ -237,7 +243,7 @@ LocalMediaStreamPlayback.prototype = Object.create(MediaStreamPlayback.prototype if (!endedFired) { onError("ended event never fired"); } - }, TIMEOUT_LENGTH); + }, ENDED_TIMEOUT_LENGTH); } } });