Permalink
Browse files

Bug 821012 - (Part 3) marionette install_busybox step should happen b…

…efore install_gecko step, r=jgriffin
  • Loading branch information...
1 parent 57174a6 commit e3bd7c6c1514e2dad2953c0a32e919c4af304999 @ahal ahal committed Jan 8, 2013
@@ -338,7 +338,10 @@ def start(self):
# setup DNS fix for networking
self._run_adb(['shell', 'setprop', 'net.dns1', '10.0.2.3'])
- def setup(self, marionette, gecko_path=None, load_early=False):
+ def setup(self, marionette, gecko_path=None, load_early=False, busybox=None):
+ if busybox:
+ self.install_busybox(busybox)
+
if gecko_path:
if load_early:
# Inject prefs into the profile now, since we have to restart
@@ -150,9 +150,8 @@ def __init__(self, host='localhost', port=2828, bin=None, profile=None,
if emulator:
self.emulator.setup(self, gecko_path=gecko_path,
- load_early=load_early)
- if busybox:
- self.emulator.install_busybox(busybox)
+ load_early=load_early,
+ busybox=busybox)
def __del__(self):
if self.emulator:

0 comments on commit e3bd7c6

Please sign in to comment.