From patchwork Wed Jun 27 09:15:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spring Zhang X-Patchwork-Id: 9647 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 B548D23E01 for ; Wed, 27 Jun 2012 09:15:18 +0000 (UTC) Received: from mail-yw0-f50.google.com (mail-yw0-f50.google.com [209.85.213.50]) by fiordland.canonical.com (Postfix) with ESMTP id 66D9AA188F6 for ; Wed, 27 Jun 2012 09:15:18 +0000 (UTC) Received: by yhjj63 with SMTP id j63so859546yhj.37 for ; Wed, 27 Jun 2012 02:15:18 -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=k4+czAzr7Yk/6V8HRfZQuHnQ2tO8fpugzbxNNPUq210=; b=YY/Jnsxu3BsMStBeb0RldMp9QmPQ934Jg7LEe4GWk2o6kxgCLRMGIz9q/88SzHeJMf rU4xAqTNIdSZDQ7rC5ct2Bvxqz3WND+1C8We56idVrYw0fXeCHx37knluahgnsSRaqUd P6fuPzdpfGmekvcH0igFQS+2iQ127f37MPhb4iyEzPsWpJK042jx3d+5eWsE7VJan3gM 71s4XpmTLYQPx+54E9z1TLGjIjWvJOyImqM0uz9GKBA4gV5xhE7wZzqO+gROHSt9GDg3 vBOvUjIeydP+f0ddOJsgoUzG+8kGCnpQkOXCCa19+aFyFpx1F34sdHAkouxcxPgWSV9d r9OA== Received: by 10.50.207.3 with SMTP id ls3mr853648igc.0.1340788517749; Wed, 27 Jun 2012 02:15:17 -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.24.148 with SMTP id v20csp6360ibb; Wed, 27 Jun 2012 02:15:16 -0700 (PDT) Received: by 10.180.105.6 with SMTP id gi6mr3083754wib.4.1340788516486; Wed, 27 Jun 2012 02:15:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id 83si22723110wet.50.2012.06.27.02.15.16 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Jun 2012 02:15: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; 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 1SjoLD-00026z-Th for ; Wed, 27 Jun 2012 09:15:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id D5FFBE02C6 for ; Wed, 27 Jun 2012 09:15:15 +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: 335 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 335: Display proxy setting to confirm if some error related with proxy config file Message-Id: <20120627091515.9276.73565.launchpad@ackee.canonical.com> Date: Wed, 27 Jun 2012 09:15:15 -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: 7e05f4cd2b5424770bb56ef07083e23fd6cd2710 X-Gm-Message-State: ALoCoQnv/GY2we6g8CkrV/CLiDDFefgxk3hUxvn6U8gVTg7tmAVLyYp/7jwUHpgDtmpeeB+EP8Sp Merge authors: Spring Zhang (qzhang) Related merge proposals: https://code.launchpad.net/~qzhang/lava-dispatcher/echo-proxy-setting/+merge/112015 proposed by: Spring Zhang (qzhang) review: Approve - Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 335 [merge] committer: Spring Zhang branch nick: lava-dispatcher timestamp: Wed 2012-06-27 17:13:53 +0800 message: Display proxy setting to confirm if some error related with proxy config file modified: lava_dispatcher/actions/lava-test.py 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/actions/lava-test.py' --- lava_dispatcher/actions/lava-test.py 2012-06-08 18:46:21 +0000 +++ lava_dispatcher/actions/lava-test.py 2012-06-26 07:02:55 +0000 @@ -143,8 +143,10 @@ if lava_proxy: session.run("sh -c 'export http_proxy=%s'" % lava_proxy) session.run("echo 'Acquire::http::proxy \"%s\";' > /etc/apt/apt.conf.d/30proxy" % lava_proxy) + session.run("cat /etc/apt/apt.conf.d/30proxy") else: session.run("echo '' > /etc/apt/apt.conf.d/30proxy") + session.run("cat /etc/apt/apt.conf.d/30proxy") _install_lava_test(self.client, session) === modified file 'lava_dispatcher/client/base.py' --- lava_dispatcher/client/base.py 2012-06-26 05:08:49 +0000 +++ lava_dispatcher/client/base.py 2012-06-27 09:13:53 +0000 @@ -391,9 +391,13 @@ 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=30) + self.proc.sendline("cat /etc/apt/apt.conf.d/30proxy") + self.proc.expect(prompt_str, timeout=30) else: self.proc.sendline("echo '' > /etc/apt/apt.conf.d/30proxy") self.proc.expect(prompt_str, timeout=30) + self.proc.sendline("cat /etc/apt/apt.conf.d/30proxy") + self.proc.expect(prompt_str, timeout=30) def boot_master_image(self):