Bug 1388082 - Convert GeckoDriver#newSession to async. r?automatedtester draft
authorAndreas Tolfsen <ato@sny.no>
Mon, 07 Aug 2017 16:52:37 +0100
changeset 642086 ac9221057550714c4e637715cd2136f9e2521e99
parent 641632 47248637eafa9a38dade8dc3aa6c4736177c8d8d
child 642087 32d410d114ccf13e4cba7a387e58c6c2806cc06c
push id72654
push userbmo:ato@sny.no
push dateMon, 07 Aug 2017 18:02:52 +0000
reviewersautomatedtester
bugs1388082
milestone57.0a1
Bug 1388082 - Convert GeckoDriver#newSession to async. r?automatedtester MozReview-Commit-ID: HuEhiXlyqX6
testing/marionette/driver.js
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -655,17 +655,17 @@ GeckoDriver.prototype.listeningPromise =
         resolve();
       }
     };
     this.mm.addMessageListener(li, cb);
   });
 };
 
 /** Create a new session. */
-GeckoDriver.prototype.newSession = function* (cmd, resp) {
+GeckoDriver.prototype.newSession = async function(cmd, resp) {
   if (this.sessionID) {
     throw new SessionNotCreatedError("Maximum number of active sessions");
   }
 
   this.sessionID = cmd.parameters.sessionId || element.generateUUID();
   this.newSessionCommandId = cmd.id;
 
   try {
@@ -733,18 +733,18 @@ GeckoDriver.prototype.newSession = funct
     this.addBrowser(win);
     this.whenBrowserStarted(win, false);
     this.mm.broadcastAsyncMessage("Marionette:restart", {});
   } else {
     throw new WebDriverError("Session already running");
   }
   this.switchToGlobalMessageManager();
 
-  yield registerBrowsers;
-  yield browserListening;
+  await registerBrowsers;
+  await browserListening;
 
   if (this.curBrowser.tab) {
     this.curBrowser.contentBrowser.focus();
   }
 
   // Setup global listener for modal dialogs, and check if there is already
   // one open for the currently selected browser window.
   modal.addHandler(this.dialogHandler);