Bug 1343749. Part 2 - remove the calls to SimpleTest.requestLongerTimeout() when MediaTestManager is used.
MozReview-Commit-ID: 4wCoA5C70Pu
--- a/dom/media/test/test_bug495145.html
+++ b/dom/media/test/test_bug495145.html
@@ -10,20 +10,16 @@ https://bugzilla.mozilla.org/show_bug.cg
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="manifest.js"></script>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=495145">Mozilla Bug 495145</a>
<pre id="test">
<script class="testbody" type="text/javascript">
-//longer timeout for slow platforms
-if (isSlowPlatform()) {
- SimpleTest.requestLongerTimeout(1.5);
-}
var manager = new MediaTestManager;
function start(e) {
e.target.play();
}
function ended1(e) {
--- a/dom/media/test/test_bug879717.html
+++ b/dom/media/test/test_bug879717.html
@@ -4,20 +4,16 @@
<title>Test for bug 879717, check that a video element can be drawn into a canvas at various states of playback</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="manifest.js"></script>
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
-//longer timeout for slow platforms
-if (isSlowPlatform()) {
- SimpleTest.requestLongerTimeout(1.5);
-}
var manager = new MediaTestManager;
var canvas = document.createElement('canvas');
document.body.appendChild(canvas);
var checkDrawImage = function(eventName, videoElement) {
var exception = null;
--- a/dom/media/test/test_fragment_noplay.html
+++ b/dom/media/test/test_fragment_noplay.html
@@ -7,21 +7,16 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="manifest.js"></script>
<script type="text/javascript" src="fragment_noplay.js"></script>
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
-//longer timeout for slow platforms
-if (isSlowPlatform()) {
- SimpleTest.requestLongerTimeout(1.5);
-}
-
var manager = new MediaTestManager;
// Fragment parameters to try
var gFragmentParams = [
// W3C Media fragment tests
// http://www.w3.org/2008/WebVideo/Fragments/TC/ua-test-cases
{ fragment: "#t=banana", start: null, end: null }, // TC0027-UA
{ fragment: "#t=3,banana", start: null, end: null }, // TC0028-UA
--- a/dom/media/test/test_loop.html
+++ b/dom/media/test/test_loop.html
@@ -4,20 +4,16 @@
<title>Test looping support</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="manifest.js"></script>
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
-//longer timeout for slow platforms
-if (isSlowPlatform()) {
- SimpleTest.requestLongerTimeout(2);
-}
var manager = new MediaTestManager;
function startTest(test, token) {
manager.started(token);
var v = document.createElement('video');
v.token = token;
v.src = test.name;
--- a/dom/media/test/test_media_selection.html
+++ b/dom/media/test/test_media_selection.html
@@ -4,20 +4,16 @@
<title>Media test: media selection</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="application/javascript" src="manifest.js"></script>
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
-//longer timeout for sometimes B2G emulator runs very slowly
-if (SpecialPowers.Services.appinfo.name == "B2G") {
- SimpleTest.requestLongerTimeout(3);
-}
var manager = new MediaTestManager;
function maketest(attach_media, name, type, check_metadata) {
return function (token) {
var e = document.createElement('video');
e.preload = "metadata";
token = name + "-" + token;
--- a/dom/media/test/test_playback.html
+++ b/dom/media/test/test_playback.html
@@ -5,22 +5,16 @@
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="manifest.js"></script>
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
-// longer timeout for slow platforms
-if (isSlowPlatform()) {
- SimpleTest.requestLongerTimeout(3);
- SimpleTest.requestCompleteLog();
-}
-
var manager = new MediaTestManager;
function startTest(test, token) {
var v = document.createElement('video');
v.preload = "metadata";
v.token = token;
v.prevTime = 0;
v.seenEnded = false;
--- a/dom/media/test/test_playback_reactivate.html
+++ b/dom/media/test/test_playback_reactivate.html
@@ -12,22 +12,16 @@
/* This testcase wants to test a video element's playback is not break
by dormant.
When the metadata is loaded, we remove the video element to trigger dormant.
Then set a timer to append the video element back and play it.
Test pass if the video plays to the end.
*/
-// longer timeout for slow platforms
-if (isSlowPlatform()) {
- SimpleTest.requestLongerTimeout(1.5);
- SimpleTest.requestCompleteLog();
-}
-
var manager = new MediaTestManager;
function startTest(test, token) {
var v = document.createElement('video');
v.preload = "metadata";
v.token = token;
var handler = {
--- a/dom/media/test/test_played.html
+++ b/dom/media/test/test_played.html
@@ -5,22 +5,17 @@
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="manifest.js"></script>
</head>
<body>
<pre id='test'>
<script class="testbody" type='application/javascript'>
-//longer timeout for sometimes B2G emulator runs very slowly
-if (SpecialPowers.Services.appinfo.name == "B2G") {
- SimpleTest.requestLongerTimeout(3);
-}
-SimpleTest.requestCompleteLog();
let manager = new MediaTestManager;
function finish_test(element) {
removeNodeAndSource(element);
manager.finished(element.token);
}
// Check that a file has been played in its entirety.