Bug 1171445 - Trigger automatic retry when Android emulator will not start; r=RyanVM
--- a/scripts/android_emulator_unittest.py
+++ b/scripts/android_emulator_unittest.py
@@ -590,17 +590,17 @@ class AndroidEmulatorTest(BlobUploadMixi
'''
Check to see if the emulator can be contacted via adb, telnet, and sut, if configured.
If any communication attempt fails, kill the emulator, re-launch, and re-check.
'''
self.mkdir_p(self.query_abs_dirs()['abs_blob_upload_dir'])
max_restarts = 3
emulator_ok = self._retry(max_restarts, 30, self._verify_emulator_and_restart_on_fail, "Check emulator")
if not emulator_ok:
- self.fatal('Unable to start emulator after %d attempts' % max_restarts)
+ self.fatal('INFRA-ERROR: Unable to start emulator after %d attempts' % max_restarts)
# Start logcat for the emulator. The adb process runs until the
# corresponding emulator is killed. Output is written directly to
# the blobber upload directory so that it is uploaded automatically
# at the end of the job.
logcat_filename = 'logcat-%s.log' % self.emulator["device_id"]
logcat_path = os.path.join(self.abs_dirs['abs_blob_upload_dir'], logcat_filename)
logcat_cmd = '%s -s %s logcat -v threadtime Trace:S StrictMode:S ExchangeService:S > %s &' % \
(self.adb_path, self.emulator["device_id"], logcat_path)