Bug 757838 - Misc b2gautomation.py cleanup; r=jgriffin a=test-only

This commit is contained in:
Ed Morley 2012-11-03 17:10:59 +00:00
Родитель 3b6bc9e193
Коммит 9ef1d28d17
1 изменённых файлов: 3 добавлений и 7 удалений

Просмотреть файл

@ -131,19 +131,16 @@ class B2GRemoteAutomation(Automation):
output.
"""
timeout = timeout or 120
didTimeout = False
done = time.time() + timeout
responseDueBy = time.time() + timeout
while True:
currentlog = proc.stdout
if currentlog:
done = time.time() + timeout
responseDueBy = time.time() + timeout
print currentlog
if hasattr(self, 'logFinish') and self.logFinish in currentlog:
return 0
else:
if time.time() > done:
if time.time() > responseDueBy:
self.log.info("TEST-UNEXPECTED-FAIL | %s | application timed "
"out after %d seconds with no output",
self.lastTestSeen, int(timeout))
@ -341,4 +338,3 @@ class B2GRemoteAutomation(Automation):
def kill(self):
# this should never happen
raise Exception("'kill' called on B2GInstance")