Backed out changeset 19d4e98a1191 (bug 1295352) for frequently failing mda test test_getUserMedia_trackEnded.html on Linux x64 debug. r=backout a=backout

--HG--
extra : source : 4693d5445f6755dea29f763a5568c456cbf3d8cb
extra : amend_source : 66a80de5c3fbed08cd94309439a351bd8f876fcc
This commit is contained in:
Sebastian Hengst 2016-10-20 20:03:17 +02:00
parent 971d25de22
commit 84075be506

View File

@ -254,23 +254,6 @@ 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());