From 650dcd50a53f403286856e538c4b8cf182b82a1f Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Wed, 7 Nov 2012 15:55:01 -0800 Subject: [PATCH] Bug 809437 - Stop b2g process before installing gecko into an emulator, r=jgriffin --- .../marionette/client/marionette/emulator.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/testing/marionette/client/marionette/emulator.py b/testing/marionette/client/marionette/emulator.py index 968887d21d3b..7bb120e9c106 100644 --- a/testing/marionette/client/marionette/emulator.py +++ b/testing/marionette/client/marionette/emulator.py @@ -387,6 +387,15 @@ waitFor( print 'installing gecko binaries...' # need to remount so we can write to /system/b2g self._run_adb(['remount']) + self.dm.shellCheckOutput(['stop', 'b2g']) + # ensure the b2g process has fully stopped (bug 809437) + for i in range(0, 10): + time.sleep(1) + if self.dm.processExist('b2g') is None: + break + else: + raise TimeoutException("Timeout waiting for the b2g process to terminate") + for root, dirs, files in os.walk(gecko_path): for filename in files: rel_path = os.path.relpath(os.path.join(root, filename), gecko_path) @@ -401,14 +410,6 @@ waitFor( raise print 'restarting B2G' - self.dm.shellCheckOutput(['stop', 'b2g']) - # ensure the b2g process has fully stopped (bug 809437) - for i in range(0, 10): - time.sleep(1) - if self.dm.processExist('b2g') is None: - break - else: - raise TimeoutException("Timeout waiting for the b2g process to terminate") self.dm.shellCheckOutput(['start', 'b2g']) if not self.wait_for_port():