Merge b2g-inbound to mozilla-central
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 17 Oct 2013 13:41:08 +0200
changeset 164856 9ab5b1d2d2b82f34ca783ce345ca1d8d3801b283
parent 164845 423b9c30c73d12176db4bd80d38206eaa5032767 (current diff)
parent 164855 367b7b76145ee90627ff027d9e66f8b613b03b05 (diff)
child 164874 6da41e59512d1a06f6c593785e9089c18b02a245
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge b2g-inbound to mozilla-central
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "86e06b1db110e34eb66826d3b1bdee3a5d57b3a7", 
+    "revision": "563d1aa93586165246ab2ab9d40566a598f56387", 
     "repo_path": "/integration/gaia-central"
 }
new file mode 100644
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/test_chrome_async_finish.js
@@ -0,0 +1,6 @@
+MARIONETTE_TIMEOUT = 60000;
+MARIONETTE_CONTEXT = "chrome";
+ok(true);
+(function () {
+  finish();
+})();
--- a/testing/marionette/client/marionette/tests/unit/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit/unit-tests.ini
@@ -88,9 +88,10 @@ b2g = false
 [test_window_title.py]
 b2g = false
 [test_window_type.py]
 b2g = false
 
 [test_implicit_waits.py]
 [test_date_time_value.py]
 [test_getactiveframe_oop.py]
-[test_submit.py]
\ No newline at end of file
+[test_submit.py]
+[test_chrome_async_finish.js]
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -839,17 +839,17 @@ MarionetteServerConnection.prototype = {
 
     //all pure JS scripts will need to call Marionette.finish() to complete the test.
     if (aRequest.newSandbox == undefined) {
       //if client does not send a value in newSandbox, 
       //then they expect the same behaviour as webdriver
       aRequest.newSandbox = true;
     }
     if (this.context == "chrome") {
-      if (aRequest.async) {
+      if (aRequest.parameters.async) {
         this.executeWithCallback(aRequest, aRequest.parameters.async);
       }
       else {
         this.execute(aRequest, true);
       }
     }
     else {
       this.sendAsync("executeJSScript",