Bug 1121666 - Use the promptservice instead of a notification box to block tests from starting right away when using marionette with --jsdebugger.;r=automatedtester
authorChris Manchester <cmanchester@mozilla.com>
Fri, 16 Jan 2015 15:01:38 -0500
changeset 251436 6453aaba884fdfa5f91f5762abce3bda74e15b83
parent 251435 7359afa423501b7cf7f6db74bd602316674de645
child 251437 2098c697b42e594d673dc6a836cfad8945ba9df4
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester
bugs1121666
milestone38.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
Bug 1121666 - Use the promptservice instead of a notification box to block tests from starting right away when using marionette with --jsdebugger.;r=automatedtester
testing/marionette/marionette-server.js
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -614,28 +614,21 @@ MarionetteServerConnection.prototype = {
       }
       else {
         let clickToStart;
         try {
           clickToStart = Services.prefs.getBoolPref('marionette.debugging.clicktostart');
           Services.prefs.setBoolPref('marionette.debugging.clicktostart', false);
         } catch (e) { }
         if (clickToStart && (appName != "B2G")) {
-          let nbox = win.gBrowser.getNotificationBox();
-          let message = "Starting marionette tests with chrome debugging enabled...";
-          let buttons = [{
-            label: "Start execution of marionette tests",
-            accessKey: 'S',
-            callback: () => this.startBrowser(win, true)
-          }];
-          nbox.appendNotification(message, null, null,
-                                  nbox.PRIORITY_WARNING_MEDIUM, buttons);
-        } else {
-          this.startBrowser(win, true);
+          let pService = Cc["@mozilla.org/embedcomp/prompt-service;1"]
+                           .getService(Ci.nsIPromptService);
+          pService.alert(win, "", "Click to start execution of marionette tests");
         }
+        this.startBrowser(win, true);
       }
     }
 
     function runSessionStart() {
       if (!Services.prefs.getBoolPref("marionette.contentListener")) {
         waitForWindow.call(this);
       }
       else if ((appName != "Firefox") && (this.curBrowser === null)) {