Bug 1131219 - Sort updated prefs alphbetically. r=dburns
authorBarbara Miller <galgeek@me.com>
Fri, 13 Feb 2015 09:22:00 -0500
changeset 256232 83b65d75fcf70d118dc96940e29f1989fcb7e0d9
parent 256231 8ed4a862c8e80c7a7feacd09e534bb1aa195bbc1
child 256233 ff356750af3abe09c279ea5f39077edb26b1c866
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)
reviewersdburns
bugs1131219
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 1131219 - Sort updated prefs alphbetically. r=dburns
testing/marionette/client/marionette/geckoinstance.py
--- a/testing/marionette/client/marionette/geckoinstance.py
+++ b/testing/marionette/client/marionette/geckoinstance.py
@@ -12,29 +12,29 @@ import time
 from mozprofile import Profile
 from mozrunner import Runner
 
 
 class GeckoInstance(object):
 
     required_prefs = {"marionette.defaultPrefs.enabled": True,
                       "marionette.logging": True,
-                      "startup.homepage_welcome_url": "about:blank",
-                      "browser.shell.checkDefaultBrowser": False,
-                      "browser.startup.page": 0,
-                      "browser.sessionstore.resume_from_crash": False,
-                      "browser.warnOnQuit": False,
                       "browser.displayedE10SPrompt": 5,
                       "browser.displayedE10SPrompt.1": 5,
                       "browser.displayedE10SPrompt.2": 5,
                       "browser.displayedE10SPrompt.3": 5,
                       "browser.displayedE10SPrompt.4": 5,
+                      "browser.sessionstore.resume_from_crash": False,
+                      "browser.shell.checkDefaultBrowser": False,
+                      "browser.startup.page": 0,
                       "browser.tabs.remote.autostart.1": False,
                       "browser.tabs.remote.autostart.2": False,
-                      "dom.ipc.reportProcessHangs": False}
+                      "browser.warnOnQuit": False,
+                      "dom.ipc.reportProcessHangs": False,
+                      "startup.homepage_welcome_url": "about:blank"}
 
     def __init__(self, host, port, bin, profile=None, app_args=None, symbols_path=None,
                   gecko_log=None, prefs=None):
         self.marionette_host = host
         self.marionette_port = port
         self.bin = bin
         # Check if it is a Profile object or a path to profile
         self.profile = None