Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout b9ec1725a5e2 (bug 809437) for frequent b2g bustage.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-11-07 20:58:14 -05:00
parent 1fa2732979
commit 81d70b099b
1 changed files with 8 additions and 9 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,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():