Bug 809437 - Ensure b2g process has fully stopped before restarting it when installing gecko into an emulator, r=jgriffin

This commit is contained in:
Andrew Halberstadt 2012-11-07 10:15:17 -08:00
parent 0c44a0904a
commit 16ee3af410

View File

@ -402,8 +402,17 @@ waitFor(
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'])
self.wait_for_port()
if not self.wait_for_port():
raise TimeoutException("Timeout waiting for marionette on port '%s'" % self.marionette_port)
self.wait_for_system_message(marionette)
def rotate_log(self, srclog, index=1):