wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 809437 - Stop b2g process before installing gecko into an emulator, r=jgriffin

Browse Source
This commit is contained in:
Andrew Halberstadt 2012-11-07 15:55:01 -08:00
parent 641bdda038
commit 70d974d9be
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
testing/marionette/client/marionette/emulator.py
View File

@ -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():