From patchwork Mon May 20 06:39:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthil Kumaran X-Patchwork-Id: 17051 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gg0-f198.google.com (mail-gg0-f198.google.com [209.85.161.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E168D20F5A for ; Mon, 20 May 2013 06:40:04 +0000 (UTC) Received: by mail-gg0-f198.google.com with SMTP id p1sf872471ggn.5 for ; Sun, 19 May 2013 23:39:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :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=P3jkOpMR/PF+u4ZvA1o+gs806ScJXMV4p5ZtTjHnGBc=; b=REhBOWOUVnKyCA8BZ8TE0qnwcH7cIDPWj0/iVpvRRQhC1WtnK52cs7nFWwZ8TYg9gO CQvZL5c+0Ju4E5G3qeuQHM5H/clYNHViF6sKdH9oH+Hu6R5u7vrwgQjeFkpQ6hTgoQ2X GnRgMJcVFRUntE2RXoOXk+QNUBfhg/1emQkQ7ZVUecVUu2046ou5bbNk9NgcwRgbJZj0 b3kNg+t5Sk2qT7PAMVSS3mduLNa3ac5f2ExdtcBtPEnrfaO5JoHgdSTDQUpEe3cpYJtE CzWrL2XCnZRif4wLU4Ne46Fxty5N9YXnWMqA2UzsJvTMcojny83FxyHy5sgQgZYr7Q40 b0ZQ== X-Received: by 10.224.217.195 with SMTP id hn3mr34270243qab.5.1369031957141; Sun, 19 May 2013 23:39:17 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.48.102 with SMTP id k6ls2379456qen.8.gmail; Sun, 19 May 2013 23:39:16 -0700 (PDT) X-Received: by 10.58.90.66 with SMTP id bu2mr33713049veb.29.1369031956920; Sun, 19 May 2013 23:39:16 -0700 (PDT) Received: from mail-vb0-x236.google.com (mail-vb0-x236.google.com [2607:f8b0:400c:c02::236]) by mx.google.com with ESMTPS id x16si3211514vci.84.2013.05.19.23.39.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 19 May 2013 23:39:16 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::236 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:c02::236; Received: by mail-vb0-f54.google.com with SMTP id f13so1110864vbg.41 for ; Sun, 19 May 2013 23:39:16 -0700 (PDT) X-Received: by 10.58.90.5 with SMTP id bs5mr33020867veb.60.1369031956736; Sun, 19 May 2013 23:39:16 -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 c10csp69688vcs; Sun, 19 May 2013 23:39:15 -0700 (PDT) X-Received: by 10.180.21.242 with SMTP id y18mr10541119wie.7.1369031955142; Sun, 19 May 2013 23:39:15 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id er3si3134494wib.12.2013.05.19.23.39.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 19 May 2013 23:39:15 -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 1UeJkY-0003YF-I7 for ; Mon, 20 May 2013 06:39:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 8164DE0955 for ; Mon, 20 May 2013 06:39:14 +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: 605 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 605: Fix bug in concatinating str and int in deploy_linaro_image attempts. Message-Id: <20130520063914.4367.89035.launchpad@ackee.canonical.com> Date: Mon, 20 May 2013 06:39:14 -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: 209ecc0ba62201de7c8a9fa10c688a18e1a55cb4 X-Gm-Message-State: ALoCoQnYqwhP/A50Ex3SOG89n9bsGNZMxWH9sGKXTjZHduftfqU/rhIfsywOp5Zn0FuMULwNMwav X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::236 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: 605 committer: Senthil Kumaran branch nick: trunk timestamp: Mon 2013-05-20 12:07:29 +0530 message: Fix bug in concatinating str and int in deploy_linaro_image attempts. modified: lava_dispatcher/client/base.py lava_dispatcher/device/master.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-15 23:15:31 +0000 +++ lava_dispatcher/client/base.py 2013-05-20 06:37:29 +0000 @@ -426,7 +426,11 @@ attempts = 0 in_linaro_image = False while (attempts < boot_attempts) and (not in_linaro_image): - logging.info("Booting the test image. Attempt: %d" % attempts + 1) + logging.info("Booting the test image. Attempt: %d" % (attempts + 1)) + timeout = self.config.boot_linaro_timeout + TESTER_PS1_PATTERN = self.target_device.deployment_data[ + 'TESTER_PS1_PATTERN'] + try: self._boot_linaro_image() except (OperationFailed, pexpect.TIMEOUT) as e: @@ -435,8 +439,6 @@ attempts += 1 continue - timeout = self.config.boot_linaro_timeout - TESTER_PS1_PATTERN = self.target_device.deployment_data['TESTER_PS1_PATTERN'] try: wait_for_prompt(self.proc, TESTER_PS1_PATTERN, timeout=timeout) except (pexpect.TIMEOUT) as e: === modified file 'lava_dispatcher/device/master.py' --- lava_dispatcher/device/master.py 2013-05-13 11:20:17 +0000 +++ lava_dispatcher/device/master.py 2013-05-20 06:37:29 +0000 @@ -398,7 +398,8 @@ attempts = 0 in_master_image = False while (attempts < boot_attempts) and (not in_master_image): - logging.info("Booting the system master image. Attempt: %d" % attempts + 1) + logging.info("Booting the system master image. Attempt: %d" % + (attempts + 1)) try: self._soft_reboot() self._wait_for_master_boot()