From patchwork Mon Mar 19 22:24:11 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: 7361 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 6C5B223E13 for ; Mon, 19 Mar 2012 22:24:15 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id C3AFAA18001 for ; Mon, 19 Mar 2012 22:24:14 +0000 (UTC) Received: by iage36 with SMTP id e36so13356936iag.11 for ; Mon, 19 Mar 2012 15:24:14 -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=GBY4mSPGX0BnsPUR0oY+jxoBDs3eXjwmch73uvXWfPc=; b=i/g5p0MeXN6o42hwF8HbUeONV2CF5QT14SyHtA38V7v4WDK98rErUyWwQLMH/HFTlm 8A/jpFYZIwruCC7JuMXJrQf7gsxXqdfhJzJPL8dGhKoWK1/hJQZPdBJ4mHvP9eZpwU9P f6f8c2acYki4hyXP1gCObs2UNMsq/RGvwM6R86LauTSRb22eSdI1F5rqBueapCjZ3dwO 5q8n7ghc+xXYHb/Bw4qK+XOElw8ut0ypQZS71HcOvm3OOO2cOnz2Q+Xks2rwHokZqAkI qjbJgcXu9jRTorOXQCO2J8ZIymMry7Qq3AmwpPZ1A5tm7bkot3ioyq7jGwzIBYMVzPN+ GkFQ== Received: by 10.50.183.163 with SMTP id en3mr7232736igc.12.1332195854256; Mon, 19 Mar 2012 15:24: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.231.203.79 with SMTP id fh15csp1252ibb; Mon, 19 Mar 2012 15:24:13 -0700 (PDT) Received: by 10.180.85.35 with SMTP id e3mr23344323wiz.6.1332195852002; Mon, 19 Mar 2012 15:24:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id u37si16760085weq.99.2012.03.19.15.24.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Mar 2012 15:24:11 -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 1S9kzr-00082G-2O for ; Mon, 19 Mar 2012 22:24:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 07FE2E0436 for ; Mon, 19 Mar 2012 22:24:11 +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: 259 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 259: * Omit the commands we send to the board from the log (as this output is Message-Id: <20120319222411.22378.18548.launchpad@ackee.canonical.com> Date: Mon, 19 Mar 2012 22:24:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14969"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 5d8930f79045bf39be6409ff9ad436c8ee25e215 X-Gm-Message-State: ALoCoQnNSUcIWDU58MtWXUkh+qrS1vfvH8jAwEKBzpOhjcbPQSGNvlUUuqsuNIhy7uM0HHe5P+vW Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dispatcher/only-logfile_read/+merge/97788 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 259 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Tue 2012-03-20 11:22:10 +1300 message: * Omit the commands we send to the board from the log (as this output is invariably echoed back and so was ending up in the output twice) modified: doc/changes.rst lava_dispatcher/client/master.py lava_dispatcher/job.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 'doc/changes.rst' --- doc/changes.rst 2012-03-13 20:00:37 +0000 +++ doc/changes.rst 2012-03-19 22:21:41 +0000 @@ -5,6 +5,8 @@ Version 0.5.10 (UNRELEASED) =========================== +* Omit the commands we send to the board from the log (as this output is + invariably echoed back and so was ending up in the output twice) .. _version_0_5_9: === modified file 'lava_dispatcher/client/master.py' --- lava_dispatcher/client/master.py 2012-03-15 17:13:46 +0000 +++ lava_dispatcher/client/master.py 2012-03-19 22:20:07 +0000 @@ -258,7 +258,8 @@ def __init__(self, context, config): super(LavaMasterImageClient, self).__init__(context, config) cmd = self.device_option("connection_command") - proc = logging_spawn(cmd, timeout=1200, logfile=self.sio) + proc = logging_spawn(cmd, timeout=1200) + proc.logfile_read = self.sio #serial can be slow, races do funny things if you don't increase delay proc.delaybeforesend=1 self.proc = proc === modified file 'lava_dispatcher/job.py' --- lava_dispatcher/job.py 2012-03-13 03:47:38 +0000 +++ lava_dispatcher/job.py 2012-03-15 23:16:06 +0000 @@ -137,7 +137,7 @@ try: for cmd in self.job_data['actions']: params = cmd.get('parameters', {}) - logging.info("[ACTION-B] Command %s is started with parameters %s." % (cmd['command'],params)) + logging.info("[ACTION-B] %s is started with %s" % (cmd['command'], params)) metadata = cmd.get('metadata', {}) self.context.test_data.add_metadata(metadata) action = lava_commands[cmd['command']](self.context)