From 81d70b099b16ec0a8d4a280d7414aa3ee6f4db8f Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 7 Nov 2012 20:58:14 -0500 Subject: [PATCH] Backout b9ec1725a5e2 (bug 809437) for frequent b2g bustage. --- .../marionette/client/marionette/emulator.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/testing/marionette/client/marionette/emulator.py b/testing/marionette/client/marionette/emulator.py index 7bb120e9c106..968887d21d3b 100644 --- a/testing/marionette/client/marionette/emulator.py +++ b/testing/marionette/client/marionette/emulator.py @@ -387,15 +387,6 @@ 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) @@ -410,6 +401,14 @@ 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():