Backed out changeset 19d4e98a1191 (bug 1295352) for frequently failing mda test test_getUserMedia_trackEnded.html on Linux x64 debug. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 20 Oct 2016 20:03:17 +0200
changeset 427705 4693d5445f6755dea29f763a5568c456cbf3d8cb
parent 427704 0d2f0fcf7185290db6623557c66959e32b552c59
child 427706 7b09d25fba1281a1fe2b9bb41d816a3ce7c53d8e
push id33099
push userdholbert@mozilla.com
push dateThu, 20 Oct 2016 20:25:54 +0000
reviewersbackout
bugs1295352
milestone52.0a1
backs out19d4e98a11915cd17c61b8563b7eb6a540d3e229
Backed out changeset 19d4e98a1191 (bug 1295352) for frequently failing mda test test_getUserMedia_trackEnded.html on Linux x64 debug. r=backout
dom/media/tests/mochitest/mediaStreamPlayback.js
--- a/dom/media/tests/mochitest/mediaStreamPlayback.js
+++ b/dom/media/tests/mochitest/mediaStreamPlayback.js
@@ -249,28 +249,11 @@ var scriptsReady = Promise.all([
   document.head.appendChild(el);
   return new Promise(r => el.onload = r);
 }));
 
 function createHTML(options) {
   return scriptsReady.then(() => realCreateHTML(options));
 }
 
-var pushPrefs = (...p) => new Promise(r => SpecialPowers.pushPrefEnv({set: p}, r));
-
-// noGum - Helper to detect whether active guM tracks still exist.
-//
-// It relies on the fact that, by spec, device labels from enumerateDevices are
-// only visible during active gum calls. They're also visible when persistent
-// permissions are granted, so turn off media.navigator.permission.disabled
-// (which is normally on otherwise in our tests). Lastly, we must turn on
-// media.navigator.permission.fake otherwise fake devices don't count as active.
-
-var noGum = () => pushPrefs(["media.navigator.permission.disabled", false],
-                            ["media.navigator.permission.fake", true])
-  .then(() => navigator.mediaDevices.enumerateDevices())
-  .then(([device]) => device &&
-      is(device.label, "", "Test must leave no active gUM streams behind."));
-
 var runTest = testFunction => scriptsReady
   .then(() => runTestWhenReady(testFunction))
-  .then(() => noGum())
   .then(() => finish());