Bug 1467215 - Abort initialisation on fatal error. r?maja_zf draft
authorAndreas Tolfsen <ato@sny.no>
Wed, 06 Jun 2018 18:31:28 +0100
changeset 805205 93bbc37107800b4034501aec007d4cdc1de02651
parent 805204 199a085199815cc99daa658956a7c9436e1d436b
child 805206 b767e4e860fc688e82ff204ec150d30561fea68a
push id112591
push userbmo:ato@sny.no
push dateThu, 07 Jun 2018 13:25:49 +0000
reviewersmaja_zf
bugs1467215
milestone62.0a1
Bug 1467215 - Abort initialisation on fatal error. r?maja_zf When the Marionette component fails to initialise we fail to bail out. This causes Marionette to report itself as enabled through an environment variable, an observer notification, and a log message. MozReview-Commit-ID: 2nTNNP0o5dv
testing/marionette/components/marionette.js
--- a/testing/marionette/components/marionette.js
+++ b/testing/marionette/components/marionette.js
@@ -444,16 +444,17 @@ class MarionetteMainProcess {
         const {TCPListener} = ChromeUtils.import("chrome://marionette/content/server.js", {});
         let listener = new TCPListener(MarionettePrefs.port);
         listener.start();
         this.server = listener;
       } catch (e) {
         log.fatal("Remote protocol server failed to start", e);
         this.uninit();
         Services.startup.quit(Ci.nsIAppStartup.eForceQuit);
+        return;
       }
 
       env.set(ENV_ENABLED, "1");
       Services.obs.notifyObservers(this, NOTIFY_RUNNING, true);
       log.debug("Remote service is active");
     });
   }