Backed out changeset 3193763d0a3b (bug 1069222) for M1 test failures

This commit is contained in:
Carsten "Tomcat" Book 2014-10-14 12:39:08 +02:00
parent 59fee7075c
commit 9068ea66c3

View File

@ -38,7 +38,6 @@ function gcTest(track) {
imageCapture.takePhoto();
}
info("Call gc ");
SpecialPowers.gc();
});
}
@ -112,20 +111,8 @@ function trackTest(track) {
function init() {
return new Promise(function(resolve, reject) {
var constraints;
if (SpecialPowers.Services.appinfo.name == "B2G") {
info("B2G ImageCapture test");
// Reduce repeat count due to b2g emulator is very slow.
repeat = 20;
// Use gonk camera, MedieEngine will be the backend of ImageCapture.
constraints = {video: true};
} else {
// use fake camera, MediaStreamGraph will be the backend of ImageCapture.
constraints = {video: true, fake: true}
}
window.navigator.mozGetUserMedia(
constraints,
{video: true, fake: true},
function(stream) {
var track = stream.getVideoTracks()[0];
resolve(track);
@ -150,15 +137,14 @@ function start() {
}).then(function(track) {
info("ImageCapture multiple instances test.");
return gcTest(track);
}).then(SimpleTest.finish);
}).then(function() {
SimpleTest.finish();
});
}
SimpleTest.requestCompleteLog();
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [["dom.imagecapture.enabled", true]]}, start);
SpecialPowers.pushPrefEnv({"set": [["dom.imagecapture.enabled", true],
["media.navigator.permission.disabled", true]
]}, start);
</script>
</pre>
</body>