From 60bd3cd7ca302a483867f4c0c6d70a2f7343d014 Mon Sep 17 00:00:00 2001 From: Martijn Wargers Date: Mon, 14 Jul 2014 12:18:16 +0200 Subject: [PATCH] Bug 902686 - Change manifest.js to use SpecialPowers.pushPrefEnv. r=edwin --- dom/media/test/manifest.js | 50 +++++-------------------- dom/media/test/test_access_control.html | 4 +- dom/media/test/test_error_on_404.html | 2 +- dom/media/test/test_load.html | 2 +- dom/media/test/test_no_load_event.html | 18 +++------ dom/media/test/test_seekable3.html | 1 + 6 files changed, 22 insertions(+), 55 deletions(-) diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js index b129117fc46..2ae7a054209 100644 --- a/dom/media/test/manifest.js +++ b/dom/media/test/manifest.js @@ -841,6 +841,8 @@ var PARALLEL_TESTS = 2; // conditions that might not otherwise be encountered on the test data. var gTestPrefs = [ ['media.recorder.max_memory', 1024], + ["media.preload.default", 2], // default preload = metadata + ["media.preload.auto", 3] // auto preload = enough ]; // When true, we'll loop forever on whatever test we run. Use this to debug @@ -992,44 +994,12 @@ function mediaTestCleanup(callback) { SpecialPowers.exactGC(window, cb); } -(function() { - SimpleTest.requestFlakyTimeout("untriaged"); +function setMediaTestsPrefs(callback, extraPrefs) { + var prefs = gTestPrefs; + if (extraPrefs) { + prefs = prefs.concat(extraPrefs); + } + SpecialPowers.pushPrefEnv({"set": prefs}, callback); +} - // Ensure that preload preferences are comsistent - var prefService = SpecialPowers.wrap(SpecialPowers.Components) - .classes["@mozilla.org/preferences-service;1"] - .getService(SpecialPowers.Ci.nsIPrefService); - var branch = prefService.getBranch("media."); - var oldDefault = 2; - var oldAuto = 3; - var oldAppleMedia = undefined; - var oldGStreamer = undefined; - var oldOpus = undefined; - - try { oldAppleMedia = SpecialPowers.getBoolPref("media.apple.mp3.enabled"); } catch(ex) { } - try { oldGStreamer = SpecialPowers.getBoolPref("media.gstreamer.enabled"); } catch(ex) { } - try { oldDefault = SpecialPowers.getIntPref("media.preload.default"); } catch(ex) { } - try { oldAuto = SpecialPowers.getIntPref("media.preload.auto"); } catch(ex) { } - try { oldOpus = SpecialPowers.getBoolPref("media.opus.enabled"); } catch(ex) { } - - SpecialPowers.setIntPref("media.preload.default", 2); // preload_metadata - SpecialPowers.setIntPref("media.preload.auto", 3); // preload_enough - // test opus playback iff the pref exists - if (oldOpus !== undefined) - SpecialPowers.setBoolPref("media.opus.enabled", true); - if (oldGStreamer !== undefined) - SpecialPowers.setBoolPref("media.gstreamer.enabled", true); - if (oldAppleMedia !== undefined) - SpecialPowers.setBoolPref("media.apple.mp3.enabled", true); - - window.addEventListener("unload", function() { - if (oldGStreamer !== undefined) - SpecialPowers.setBoolPref("media.gstreamer.enabled", oldGStreamer); - if (oldAppleMedia !== undefined) - SpecialPowers.setBoolPref("media.apple.mp3.enabled", oldAppleMedia); - SpecialPowers.setIntPref("media.preload.default", oldDefault); - SpecialPowers.setIntPref("media.preload.auto", oldAuto); - if (oldOpus !== undefined) - SpecialPowers.setBoolPref("media.opus.enabled", oldOpus); - }, false); - })(); +SimpleTest.requestFlakyTimeout("untriaged"); \ No newline at end of file diff --git a/dom/media/test/test_access_control.html b/dom/media/test/test_access_control.html index 57bfeb97b50..8cb82803b35 100644 --- a/dom/media/test/test_access_control.html +++ b/dom/media/test/test_access_control.html @@ -28,7 +28,9 @@ function done() { SimpleTest.finish(); } -addLoadEvent(run); +addLoadEvent(function() { + setMediaTestsPrefs(run); +}); SimpleTest.waitForExplicitFinish(); diff --git a/dom/media/test/test_error_on_404.html b/dom/media/test/test_error_on_404.html index c16d0b4f855..e49f03e2278 100644 --- a/dom/media/test/test_error_on_404.html +++ b/dom/media/test/test_error_on_404.html @@ -57,7 +57,7 @@ function loadStart(evt) { // Create all video objects. for (var i=0; iMozilla Bug 715469 

 
@@ -32,18 +31,14 @@ function start() {
     SimpleTest.waitForExplicitFinish();
     var v = document.createElement("video");
     v.src = resource.name;
-    v.addEventListener("loadeddata", function(){v.play();}, false);
-    v.controls = "true";
-    
-    v.addEventListener("load",
-      function(){
-        gotLoadEvent = true;
-      },
-      false);
-      
+
+    v.addEventListener("load", function() {
+      gotLoadEvent = true;
+    }, false);
+
     v.addEventListener("ended", finished, false);
-    
     document.body.appendChild(v);
+    v.play();
   }
 }
 
@@ -52,7 +47,6 @@ function finished() {
   SimpleTest.finish();
 }
 
-
diff --git a/dom/media/test/test_seekable3.html b/dom/media/test/test_seekable3.html index ee0cf7ad09b..649468a708a 100644 --- a/dom/media/test/test_seekable3.html +++ b/dom/media/test/test_seekable3.html @@ -30,6 +30,7 @@ SimpleTest.waitForExplicitFinish();