From patchwork Wed Jun 27 02:11:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 9636 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 01ECB23EE3 for ; Wed, 27 Jun 2012 02:11:12 +0000 (UTC) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by fiordland.canonical.com (Postfix) with ESMTP id D28B4A180A3 for ; Wed, 27 Jun 2012 02:11:11 +0000 (UTC) Received: by lbbgj3 with SMTP id gj3so1035048lbb.11 for ; Tue, 26 Jun 2012 19:11:11 -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=dpeVol6TRuwsdnSH5nstmpkIBKLZf7tVOrfwg4ZhMBU=; b=C1EN0CviDecYY+arLSmtCmPNOmZmQPQhVxf516Rb4vyc60nt6SfAzrtqYvmx3ROJ8E TOpvb45nD/yi2auPlpHiW7GfmESUk2HAyIy6XQ9q37Si+fIhewcmyxqTijFSwtwkqPvE a76jefu2McMwFrTGY86Pct4ViBpbYrc0tnHtlnw25nCIudkq8E/qrJNN5Q7cKVpJPqIy AXRIkmWz8diz+PTYRjG7RMg1/PG0S9a/rUnc0Nh7jEVOm4t9iVBjjIUI2gxHt+mI8nFy eZZzp8V6afx+2mwDntjjG+qUcC4YLsnJOczg0MUP6lBbhSBaYGHif/8QpDYbnvJr+xVe Gv+g== Received: by 10.152.48.6 with SMTP id h6mr18473455lan.30.1340763071438; Tue, 26 Jun 2012 19:11:11 -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.152.148.101 with SMTP id tr5csp34917lab; Tue, 26 Jun 2012 19:11:10 -0700 (PDT) Received: by 10.180.106.137 with SMTP id gu9mr577968wib.20.1340763070241; Tue, 26 Jun 2012 19:11:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id g5si21724163wer.19.2012.06.26.19.11.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 26 Jun 2012 19:11:10 -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 1Sjhin-0004LX-Vq for ; Wed, 27 Jun 2012 02:11:09 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id E4F45E023F for ; Wed, 27 Jun 2012 02:11:09 +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: 334 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 334: make passing timeout in respsones to CommandRunner.run do something more useful Message-Id: <20120627021109.15393.24396.launchpad@ackee.canonical.com> Date: Wed, 27 Jun 2012 02:11:09 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15482"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 7ec85a58aea3273a04270132795cbe3b34ba1a03 X-Gm-Message-State: ALoCoQkmusFUnfre339zog03UXZz4tbmAaEfI6nBEcMmL7Bv+vuP0sAfdWL459M3cFogw3dxJRnk Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dispatcher/CommandRunner-timeout-bug-1009302/+merge/112003 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Andy Doan (doanac) ------------------------------------------------------------ revno: 334 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Wed 2012-06-27 14:10:36 +1200 message: make passing timeout in respsones to CommandRunner.run do something more useful 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 2012-06-25 19:42:56 +0000 +++ lava_dispatcher/client/base.py 2012-06-26 05:08:49 +0000 @@ -79,6 +79,8 @@ if response is not None: self.match_id = self._connection.expect(response, timeout=timeout) self.match = self._connection.match + if self.match == pexpect.TIMEOUT: + return None # If a non-trivial timeout was specified, it is held to apply to # the whole invocation, so now reduce the time we'll wait for the # shell prompt.