From patchwork Thu May 17 14:04:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Pigott X-Patchwork-Id: 8756 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 0C54F23E49 for ; Thu, 17 May 2012 14:04:13 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id C0B54A184FD for ; Thu, 17 May 2012 14:04:12 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so2171624yen.11 for ; Thu, 17 May 2012 07:04:12 -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=OaH39PKfOZJyUmVMG+sgd48BypO/6nl+uXoJwhpI2/U=; b=bI76S6ko3eDzKqKmd2UPmdnLzjuoqCHPUQInuojTpO8Kjd1oWb5NQC92eAaQWAnHyQ PgoVZxQ4rPScCcCq9XNvXAM0BwxeO2PQgm3BfGdmRM8GOiwcMr4Mk+CNcVfJYkS4q2hM N+h8hwHuZqDA7NhSKc5+ZbLJmp9Zws9YfLX5GF6dKChbZ9xZ/tgxRmnpLebz4IU+1YAo KGYRDwJEIuzz0M3KnQNvw7bUqOKbZO46KFHbPLjisP/kqsOnkQsXmc1sNuxnPhM0GT2o HRTG3RD33Iqj3mwoLAnnQ5PLeaNUqTFo53n4TdmsJikISfLvYcY0dw3Y5rA/2sZoMauC P+QQ== Received: by 10.50.222.202 with SMTP id qo10mr13691793igc.0.1337263452253; Thu, 17 May 2012 07:04:12 -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.231.35.72 with SMTP id o8csp30303ibd; Thu, 17 May 2012 07:04:11 -0700 (PDT) Received: by 10.180.74.193 with SMTP id w1mr18700701wiv.4.1337263450603; Thu, 17 May 2012 07:04:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id t18si30242772wiv.29.2012.05.17.07.04.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 May 2012 07:04: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 1SV1JK-0007xb-2x for ; Thu, 17 May 2012 14:04:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 09C8FE522D for ; Thu, 17 May 2012 14:04:10 +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: 287 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 287: Merge changes Message-Id: <20120517140410.4762.49382.launchpad@ackee.canonical.com> Date: Thu, 17 May 2012 14:04:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15259"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: ab98b33a35c2160a55cdffdf663f3a31f617e72e X-Gm-Message-State: ALoCoQlV1xiQP6AvFOmOaKuqMzeeR8sSh4QwXLAdfMmA5PSKypjnl0ghmR5RJp2LEkDK1LNn0ebF Merge authors: Dave Pigott (dpigott) Related merge proposals: https://code.launchpad.net/~dpigott/lava-dispatcher/timeout-changes/+merge/106163 proposed by: Dave Pigott (dpigott) review: Approve - Fathi Boudra (fboudra) ------------------------------------------------------------ revno: 287 [merge] committer: dave.pigott@linaro.org branch nick: trunk timestamp: Thu 2012-05-17 15:02:04 +0100 message: Merge changes 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-04-23 05:51:22 +0000 +++ lava_dispatcher/client/base.py 2012-05-17 13:02:48 +0000 @@ -383,13 +383,16 @@ if lava_proxy: logging.info("Setting up http proxy") # haven't included Android support yet + # Timeout is 30 seconds because of some underlying + # problem that causes these commands to sometimes + # take around 15-20 seconds. self.proc.sendline("export http_proxy=%s" % lava_proxy) - self.proc.expect(prompt_str, timeout=10) + self.proc.expect(prompt_str, timeout=30) self.proc.sendline("echo 'Acquire::http::proxy \"%s\";' > /etc/apt/apt.conf.d/30proxy" % lava_proxy) - self.proc.expect(prompt_str, timeout=10) + self.proc.expect(prompt_str, timeout=30) else: self.proc.sendline("echo '' > /etc/apt/apt.conf.d/30proxy") - self.proc.expect(prompt_str, timeout=10) + self.proc.expect(prompt_str, timeout=30) def boot_master_image(self):