From patchwork Thu Nov 1 15:26:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Pigott X-Patchwork-Id: 12648 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 12F0223F46 for ; Thu, 1 Nov 2012 15:26:16 +0000 (UTC) Received: from mail-da0-f52.google.com (mail-da0-f52.google.com [209.85.210.52]) by fiordland.canonical.com (Postfix) with ESMTP id ABB0AA1866D for ; Thu, 1 Nov 2012 15:26:15 +0000 (UTC) Received: by mail-da0-f52.google.com with SMTP id f10so1162286dak.11 for ; Thu, 01 Nov 2012 08:26:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type: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; bh=nA6IIzbMeeC4OE65snbLfuXc3P9mNbcDwsTG/RF5vDs=; b=d4ykYC592FK2PTFosUTcU7iBUPNjyROP26LV1hJ1mBkfiEEownupNVByMv2KarK6Th JLc3SrrbwLCao9YqxmKO7EPsrEizdO5+2Lp7tzifuRiqw5qdkxU8dpJJKAvBozmFcbl1 0N3VBfkoDWdacI0oJ5soEOdPn75KCawWDYnJPhocqmE6U3FAOl6FW1CmCUaO3SOyfW7G Y9yA/WJPa0jA/WvUecBa7qGJAd6Arr4EuEMfxrCXOJKXklQi2rhfmtLVjqrm+/y+rwDg 6jrMv9ppGq+xrDQllDlOhsdu8jWoxlBBU54AFcUlOHLtvfKVxyCDM2A2PXCg3swFye51 MiLw== Received: by 10.68.217.131 with SMTP id oy3mr16450518pbc.145.1351783574951; Thu, 01 Nov 2012 08:26:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.68.34.137 with SMTP id z9csp716498pbi; Thu, 1 Nov 2012 08:26:14 -0700 (PDT) Received: by 10.180.80.100 with SMTP id q4mr2432746wix.20.1351783573536; Thu, 01 Nov 2012 08:26:13 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id by3si15132512wib.17.2012.11.01.08.26.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 08:26:13 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1TTweq-0005QG-Ot for ; Thu, 01 Nov 2012 15:26:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id A9F31E02DE for ; Thu, 1 Nov 2012 15:26:12 +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: 432 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 432: Fix while/except drop through bug Message-Id: <20121101152612.11071.35074.launchpad@ackee.canonical.com> Date: Thu, 01 Nov 2012 15:26:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16218"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: cc0d1137cba358f9652bc5472dc1af38453be1b5 X-Gm-Message-State: ALoCoQkNBcpYsGn5X03N60sP4oOJG+lX2/zlgUYJukEKW4t1WIngsUK+ufhbCCBxxCMi2Ej7wRvT Merge authors: Dave Pigott (dpigott) Related merge proposals: https://code.launchpad.net/~dpigott/lava-dispatcher/fix-except-while-drop-through/+merge/132572 proposed by: Dave Pigott (dpigott) review: Approve - Dave Pigott (dpigott) ------------------------------------------------------------ revno: 432 [merge] committer: dave.pigott@linaro.org branch nick: lava-dispatcher timestamp: Thu 2012-11-01 16:15:21 +0100 message: Fix while/except drop through bug modified: 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/device/master.py' --- lava_dispatcher/device/master.py 2012-10-31 21:58:30 +0000 +++ lava_dispatcher/device/master.py 2012-11-01 15:11:08 +0000 @@ -458,12 +458,15 @@ network_up = False attempts = 1 while (attempts <> 0) and (not network_up): - try: - self.wait_network_up() + while True: + try: + self.wait_network_up() + except NetworkError: + self._client.boot_master_image() + attempts = attempts - 1 + continue network_up = True - except NetworkError: - self._client.boot_master_image() - attempts = attempts-1 + break if not network_up: msg = "Unable to reach LAVA server, check network" logging.error(msg)