Bug 815807 - Part 1a: temporarily enable some code until Part 2 lands, a=test-only
authorJonathan Griffin <jgriffin@mozilla.com>
Wed, 28 Nov 2012 13:54:18 -0800
changeset 114414 2c3ca2156b006ec666320b5fc005e2980efc71df
parent 114413 3ea3a0aa4b08de25a30305ac28b8ec0469e8e11e
child 114415 83c8b42da6ed23147b948e26decc9e635519a120
push id23917
push useremorley@mozilla.com
push dateThu, 29 Nov 2012 14:20:29 +0000
treeherdermozilla-central@c72d38e7a212 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs815807
milestone20.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 815807 - Part 1a: temporarily enable some code until Part 2 lands, a=test-only
testing/marionette/client/marionette/emulator.py
--- a/testing/marionette/client/marionette/emulator.py
+++ b/testing/marionette/client/marionette/emulator.py
@@ -388,17 +388,19 @@ waitFor(
                 # Inject prefs into the profile now, since we have to restart
                 # B2G after installing a new gecko anyway.
                 self.add_prefs_to_profile()
             self.install_gecko(gecko_path, marionette)
         elif load_early:
             self.add_prefs_to_profile()
             self.restart_b2g()
 
-        if load_early:
+        #if load_early:
+        # Temporarily enable this always until part 2 of bug 815807 lands
+        if True:
             # If we're loading early, we have to wait for the
             # system-message-listener-ready event again after restarting B2G.
             # If we're not loading early, we skip this because Marionette
             # doesn't load until after this event has fired.
             self.wait_for_system_message(marionette)
 
     def restart_b2g(self):
         print 'restarting B2G'