Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge b2g-inbound to mozilla-central

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2013-10-17 13:41:08 +02:00
commit ef3b3325fc
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "86e06b1db110e34eb66826d3b1bdee3a5d57b3a7",
"revision": "563d1aa93586165246ab2ab9d40566a598f56387",
"repo_path": "/integration/gaia-central"
}

6
testing/marionette/client/marionette/tests/unit/test_chrome_async_finish.js Normal file
View File

@ -0,0 +1,6 @@
MARIONETTE_TIMEOUT = 60000;
MARIONETTE_CONTEXT = "chrome";
ok(true);
(function () {
finish();
})();

3
testing/marionette/client/marionette/tests/unit/unit-tests.ini
View File

@ -93,4 +93,5 @@ b2g = false
[test_implicit_waits.py]
[test_date_time_value.py]
[test_getactiveframe_oop.py]
[test_submit.py]
[test_submit.py]
[test_chrome_async_finish.js]

2
testing/marionette/marionette-server.js
View File

@ -844,7 +844,7 @@ MarionetteServerConnection.prototype = {
aRequest.newSandbox = true;
}
if (this.context == "chrome") {
if (aRequest.async) {
if (aRequest.parameters.async) {
this.executeWithCallback(aRequest, aRequest.parameters.async);
}
else {