From patchwork Mon Jul 23 03:00:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spring Zhang X-Patchwork-Id: 10171 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 BBA0E23E23 for ; Mon, 23 Jul 2012 03:00:20 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 50B87A18461 for ; Mon, 23 Jul 2012 03:00:20 +0000 (UTC) Received: by ghbz12 with SMTP id z12so5373271ghb.11 for ; Sun, 22 Jul 2012 20:00:19 -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=yUYh5xhnzVjWM1AQPVzCfFBCb2W7o1JzJ9jRoE59cWc=; b=B9jW4wZLeBEGDlpkrXNEjhO2LWfo9JexyuVx594YhKoGEDc5pXBJfhKCYFQx6Bd8In IKptyv+2x/dprTP97XrxYFm/sjUJIactGjt62hliD2x4wyL8X1lbRf+ITqfYRm9YrQ2q YlSidH13JX/I8hXCvL7Hq8C09FChm+KTA7VbgoGPcbKRgM64GRtRYzW+ujvtFOBe8OQc tgSj2iwWvb1CgPbHcLsEdVE/U/3hG638iDaLTFQwqciLdRnOhAnCERAU1VOIVu+hbou7 +7GCvuWWrXWkhefo6792OYgtxY+yeQavNFoZTuceCnHsJzx2ScaROf88hhQesDTP3e/y h8Mg== Received: by 10.50.207.65 with SMTP id lu1mr9382779igc.33.1343012419349; Sun, 22 Jul 2012 20:00:19 -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.153.7 with SMTP id i7csp50217ibw; Sun, 22 Jul 2012 20:00:18 -0700 (PDT) Received: by 10.180.99.196 with SMTP id es4mr44841916wib.18.1343012417381; Sun, 22 Jul 2012 20:00:17 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id q10si12926070wiy.19.2012.07.22.20.00.16 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jul 2012 20:00:17 -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 1St8sa-0007ie-FC for ; Mon, 23 Jul 2012 03:00:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 4E4ABE2356 for ; Mon, 23 Jul 2012 03:00:16 +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: 357 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 357: Delete temporarily added proxy echo commands Message-Id: <20120723030016.2724.7549.launchpad@ackee.canonical.com> Date: Mon, 23 Jul 2012 03:00:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15654"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 8e1050dd0f24d3261f17fce38d94e2a92ceaa0cb X-Gm-Message-State: ALoCoQly/TMNuwPXTTN58XYi3vqp3ZECN7kuZRIjVUphO2y9DeS834o8SSqjmQ+rjp+5XxHmhpth Merge authors: Spring Zhang (qzhang) Related merge proposals: https://code.launchpad.net/~qzhang/lava-dispatcher/fix-1025829/+merge/115644 proposed by: Spring Zhang (qzhang) review: Approve - Andy Doan (doanac) ------------------------------------------------------------ revno: 357 [merge] committer: Spring Zhang branch nick: lava-dispatcher timestamp: Mon 2012-07-23 10:58:42 +0800 message: Delete temporarily added proxy echo commands 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-26 07:02:55 +0000 +++ lava_dispatcher/actions/lava-test.py 2012-07-19 02:59:59 +0000 @@ -143,10 +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") + # If the rootfs is new generated, the cmd will fail, + # just ignore it + session.run("rm -f /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-07-21 22:56:42 +0000 +++ lava_dispatcher/client/base.py 2012-07-23 02:58:42 +0000 @@ -396,12 +396,9 @@ 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") + # If the rootfs is new generated, the cmd will fail, just ignore it + self.proc.sendline("rm -f /etc/apt/apt.conf.d/30proxy") self.proc.expect(prompt_str, timeout=30)