~dpigott/lava-dispatcher/fix-80-character-line-wrap-problem

« back to all changes in this revision

Viewing changes to lava_dispatcher/client/base.py

  • Committer: Senthil Kumaran
  • Date: 2013-05-21 07:11:59 UTC
  • Revision ID: senthil.kumaran@linaro.org-20130521071159-qpyt8e2pnzr1ei2h
Fix bug in concatinating str and int in boot_linaro_android_image
attempts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
480
480
        in_linaro_android_image = False
481
481
 
482
482
        while (attempts < boot_attempts) and (not in_linaro_android_image):
483
 
            logging.info("Booting the android test image. Attempt: %d" % attempts + 1)
 
483
            logging.info("Booting the android test image. Attempt: %d" %
 
484
                         (attempts + 1))
 
485
            TESTER_PS1_PATTERN = self.target_device.deployment_data[
 
486
                'TESTER_PS1_PATTERN']
 
487
            timeout = self.config.android_boot_prompt_timeout
 
488
 
484
489
            try:
485
490
                self._boot_linaro_android_image()
486
491
            except (OperationFailed, pexpect.TIMEOUT) as e:
489
494
                attempts += 1
490
495
                continue
491
496
 
492
 
            TESTER_PS1_PATTERN = self.target_device.deployment_data['TESTER_PS1_PATTERN']
493
 
            timeout = self.config.android_boot_prompt_timeout
494
497
            try:
495
498
                wait_for_prompt(self.proc, TESTER_PS1_PATTERN, timeout=timeout)
496
499
            except pexpect.TIMEOUT: