From patchwork Tue May 21 07:13:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthil Kumaran X-Patchwork-Id: 17072 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0983F238F5 for ; Tue, 21 May 2013 07:14:10 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id f11sf262933wgh.5 for ; Tue, 21 May 2013 00:13:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=DDwoszzspPsHKlWkXNTtkyIhVIaiep46cRMRhI0h8Ps=; b=ZRHm+vCrSGAZ51DjedTFUm4YanCjyyaG1uBo4nP2hV4yfVWOMLrnb+4BjMXEbdtZxY NtHXjuEy/27gLu6+PZCxPvtbR80Efl+WhXB7/62ZoFqDA7DjTXzzFiOwTQRHd0aSGJTz hvkIF/NTzIgbUFrmMnekvhr/gtUgUPjaTQQ7Ik7YoK0OwGoa1wuu51LieesxTmdYqBe9 R/jZAkErV3L9RYPl5zmiwdCoCUw4/1uNv4qtzrPa9ripy6jG0nwXNHOFhMRH7kYzSQza yJCstaLCajP6Nu99L7hpjH6NfPDr/GvIKVxcODNZoxJdMKZG2FHapKMdPJYru5Pl9ySn jucg== X-Received: by 10.180.75.133 with SMTP id c5mr212315wiw.2.1369120399948; Tue, 21 May 2013 00:13:19 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.76.71 with SMTP id i7ls953854wiw.47.canary; Tue, 21 May 2013 00:13:19 -0700 (PDT) X-Received: by 10.180.90.70 with SMTP id bu6mr1917675wib.34.1369120399857; Tue, 21 May 2013 00:13:19 -0700 (PDT) Received: from mail-ve0-x22e.google.com (mail-ve0-x22e.google.com [2607:f8b0:400c:c01::22e]) by mx.google.com with ESMTPS id hp8si871015wib.2.2013.05.21.00.13.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 May 2013 00:13:19 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22e; Received: by mail-ve0-f174.google.com with SMTP id oy12so176646veb.5 for ; Tue, 21 May 2013 00:13:18 -0700 (PDT) X-Received: by 10.52.34.114 with SMTP id y18mr332634vdi.56.1369120398754; Tue, 21 May 2013 00:13:18 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.126.138 with SMTP id c10csp116389vcs; Tue, 21 May 2013 00:13:17 -0700 (PDT) X-Received: by 10.180.39.137 with SMTP id p9mr20535086wik.27.1369120396916; Tue, 21 May 2013 00:13:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id n6si823236wie.122.2013.05.21.00.13.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 21 May 2013 00:13:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Uegl2-0000xm-Fi for ; Tue, 21 May 2013 07:13:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 65C2DE0195 for ; Tue, 21 May 2013 07:13:16 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 607 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 607: Fix bug in concatinating str and int in boot_linaro_android_image Message-Id: <20130521071316.12986.89971.launchpad@ackee.canonical.com> Date: Tue, 21 May 2013 07:13:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16626"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: cf5b06349753e225d871ebe7bd7e6a2123e59a58 X-Gm-Message-State: ALoCoQnLyNvxeY525QW/I5b3hfiGjhjsRvb1YkrhqIQOjjCwhxO9Rd+FsIDTpAmr7s0SxYas0+to X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ------------------------------------------------------------ revno: 607 committer: Senthil Kumaran branch nick: trunk timestamp: Tue 2013-05-21 12:41:59 +0530 message: Fix bug in concatinating str and int in boot_linaro_android_image attempts. modified: lava_dispatcher/client/base.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/client/base.py' --- lava_dispatcher/client/base.py 2013-05-20 14:25:22 +0000 +++ lava_dispatcher/client/base.py 2013-05-21 07:11:59 +0000 @@ -480,7 +480,12 @@ in_linaro_android_image = False while (attempts < boot_attempts) and (not in_linaro_android_image): - logging.info("Booting the android test image. Attempt: %d" % attempts + 1) + logging.info("Booting the android test image. Attempt: %d" % + (attempts + 1)) + TESTER_PS1_PATTERN = self.target_device.deployment_data[ + 'TESTER_PS1_PATTERN'] + timeout = self.config.android_boot_prompt_timeout + try: self._boot_linaro_android_image() except (OperationFailed, pexpect.TIMEOUT) as e: @@ -489,8 +494,6 @@ attempts += 1 continue - TESTER_PS1_PATTERN = self.target_device.deployment_data['TESTER_PS1_PATTERN'] - timeout = self.config.android_boot_prompt_timeout try: wait_for_prompt(self.proc, TESTER_PS1_PATTERN, timeout=timeout) except pexpect.TIMEOUT: