Bug 1484720 - Part 3: Remove some media tests' obsolete checks for B2G. r=jya

Differential Revision: https://phabricator.services.mozilla.com/D34994

--HG--
extra : rebase_source : bef672f4f4c405ad9b772342c107b7b3767d3cae
This commit is contained in:
Chris Peterson 2019-06-05 23:22:16 -07:00
parent eb091a1b53
commit 1489548174

View File

@ -57,17 +57,10 @@ var gFrameCountTests = [
{ name:"av1.mp4", type:"video/mp4", totalFrameCount:24},
];
if (SpecialPowers.Services.appinfo.name != "B2G") {
// We only run mochitests on b2g desktop and b2g emulator. The 3gp codecs
// aren't present on desktop, and the emulator codecs (which are different
// from the real device codecs) don't pass all of our tests, so we need
// to disable them.
gSmallTests = gSmallTests.concat([
{ name:"sample.3gp", type:"video/3gpp", duration:4.933 },
{ name:"sample.3g2", type:"video/3gpp2", duration:4.933 }
]);
}
gSmallTests = gSmallTests.concat([
{ name:"sample.3gp", type:"video/3gpp", duration:4.933 },
{ name:"sample.3g2", type:"video/3gpp2", duration:4.933 }
]);
// Used by test_bug654550.html, for videoStats preference
var gVideoTests = [
@ -490,7 +483,7 @@ function makeAbsolutePathConverter() {
resolve((path, mustExist) => {
// android mochitest doesn't support file://
if (manifestNavigator().appVersion.includes("Android") || SpecialPowers.Services.appinfo.name == "B2G")
if (manifestNavigator().appVersion.includes("Android"))
return path;
const { Ci, Cc } = SpecialPowers;
@ -639,13 +632,9 @@ var gUnseekableTests = [
var androidVersion = -1; // non-Android platforms
if (manifestNavigator().userAgent.includes("Mobile") ||
manifestNavigator().userAgent.includes("Tablet")) {
// See nsSystemInfo.cpp, the getProperty('version') returns different value
// on each platforms, so we need to distinguish the android and B2G platform.
var versionString = manifestNavigator().userAgent.includes("Android") ?
'version' : 'sdk_version';
androidVersion = SpecialPowers.Cc['@mozilla.org/system-info;1']
.getService(SpecialPowers.Ci.nsIPropertyBag2)
.getProperty(versionString);
.getProperty('version');
}
function getAndroidVersion() {