Bug 814140 - Run b2g mochitests from an app hosted on the mochitest server, r=ahal

This commit is contained in:
David Clarke 2012-12-05 14:28:00 -05:00
parent 7314223817
commit a3d9f016f8
3 changed files with 40 additions and 1 deletions

View File

@ -49,6 +49,7 @@ _SERV_FILES = \
runtestsb2g.py \
runtestsremote.py \
runtestsvmware.py \
manifest.webapp \
$(topsrcdir)/testing/mozbase/mozdevice/mozdevice/devicemanager.py \
$(topsrcdir)/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py \
$(topsrcdir)/testing/mozbase/mozdevice/mozdevice/devicemanagerSUT.py \

View File

@ -0,0 +1,38 @@
{
"name": "Mochitest",
"type": "certified",
"description": "Mochitests",
"developer": {
"name": "The Ateam",
"url": "https://wiki.mozilla.org/Auto-tools"
},
"permissions": {
"alarms": {},
"browser":{},
"power":{},
"webapps-manage":{},
"mobileconnection":{},
"mozBluetooth":{},
"bluetooth":{},
"telephony":{},
"voicemail":{},
"device-storage:pictures":{ "access": "readwrite" },
"settings":{ "access": "readwrite" },
"storage":{},
"camera":{},
"geolocation":{},
"wifi-manage":{},
"wifi":{},
"desktop-notification":{},
"idle":{},
"network-events":{},
"embed-apps":{}
},
"locales": {
"en-US": {
"name": "Mochitest",
"description": "Mochitests"
}
},
"default_locale": "en-US"
}

View File

@ -397,6 +397,7 @@ const CHILD_LOGGER_SCRIPT = "chrome://specialpowers/content/MozillaLogger.js";
let homescreen = document.getElementById('homescreen');
let container = homescreen.contentWindow.document.getElementById('test-container');
container.setAttribute('mozapp', 'http://mochi.test:8888/manifest.webapp');
let specialpowers = {};
let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
@ -428,7 +429,6 @@ user_pref("dom.mozBrowserFramesEnabled", true);
user_pref("dom.ipc.tabs.disabled", false);
user_pref("dom.ipc.browser_frames.oop_by_default", false);
user_pref("dom.mozBrowserFramesWhitelist","app://test-container.gaiamobile.org,http://mochi.test:8888");
user_pref("network.dns.localDomains","app://test-container.gaiamobile.org");
user_pref("marionette.loadearly", true);
""")
f.close()