From patchwork Fri Mar 29 18:40:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Baker X-Patchwork-Id: 15772 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 9DF994C13C6 for ; Fri, 29 Mar 2013 18:40:20 +0000 (UTC) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by fiordland.canonical.com (Postfix) with ESMTP id 4A0E7A18F04 for ; Fri, 29 Mar 2013 18:40:20 +0000 (UTC) Received: by mail-vc0-f177.google.com with SMTP id ia10so735017vcb.8 for ; Fri, 29 Mar 2013 11:40:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :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=y3yr/QhyTiI+dxj0UM+f5Jdi2IWaG/744ao2rC8pBxQ=; b=OsZSzzDbPP7pX14RJZ7UbxEIXZMifp+lAiOP0xShBXFSynKmYqRtgddve69Noaw1Ir 9EvDOk+RmEw0BZghPX9lJ+GGuP/1gnvqwv1pJWNvvOtQfq6qSS8MC4bL9Q7fPwpKTm78 R7zBIOhFLZhazM0xMkB++oMc0YObI3qNVDcEj2Rt3Vkxy2Yg7aIcAMtzRYmZNXGWtylE c+AUyhMb165qOL+kK94ZME4DM+r4ySlvaTpKcas28UN8YN/eKvLndcPWleoy9t3Z+ySV vfbnHKBGCcWm88qIS3491CQAkiIy4ByCZaZA9SGnqKXDZSr3SFtzbgAF8TO5gFALtdDG 8szg== X-Received: by 10.52.76.103 with SMTP id j7mr2238513vdw.90.1364582419814; Fri, 29 Mar 2013 11:40: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.59.4.204 with SMTP id cg12csp72145ved; Fri, 29 Mar 2013 11:40:19 -0700 (PDT) X-Received: by 10.180.185.239 with SMTP id ff15mr807049wic.2.1364582418470; Fri, 29 Mar 2013 11:40:18 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id vf9si1456345wjc.42.2013.03.29.11.40.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 29 Mar 2013 11:40:18 -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 1ULeDp-0000Zb-Sr for ; Fri, 29 Mar 2013 18:40:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id CB1E7E0167 for ; Fri, 29 Mar 2013 18:40:17 +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: 569 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 569: Generalize Nexus implementation Message-Id: <20130329184017.2302.93006.launchpad@ackee.canonical.com> Date: Fri, 29 Mar 2013 18:40:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16546"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: a7533afef0ea77a4a3d999808d53bbae0af61935 X-Gm-Message-State: ALoCoQkgLw5gnU86n2k4hAFv3SY7I7RpywnfWuCmaSwAhWToz4cZ1dE9RoPbjpK2yAKkerM54T0t Merge authors: Tyler Baker (tyler-baker) Related merge proposals: https://code.launchpad.net/~tyler-baker/lava-dispatcher/refactor-nexus/+merge/156205 proposed by: Tyler Baker (tyler-baker) review: Approve - Tyler Baker (tyler-baker) ------------------------------------------------------------ revno: 569 [merge] committer: Tyler Baker branch nick: lava-dispatcher timestamp: Fri 2013-03-29 11:38:27 -0700 message: Generalize Nexus implementation renamed: lava_dispatcher/device/nexus.py => lava_dispatcher/device/fastboot.py modified: lava_dispatcher/config.py lava_dispatcher/default-config/lava-dispatcher/device-types/nexus.conf lava_dispatcher/device/fastboot.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/config.py' --- lava_dispatcher/config.py 2013-02-18 06:00:28 +0000 +++ lava_dispatcher/config.py 2013-03-29 18:21:28 +0000 @@ -95,7 +95,7 @@ adb_command = schema.StringOption() fastboot_command = schema.StringOption() - nexus_working_directory = schema.StringOption(default=None) + shared_working_directory = schema.StringOption(default=None) class OptionDescriptor(object): def __init__(self, name): === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/nexus.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/nexus.conf 2013-01-22 01:58:09 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/nexus.conf 2013-03-29 18:21:28 +0000 @@ -25,19 +25,19 @@ # Working directory for temporary files. By default, the usual place for LAVA # images will be used. # -# This is useful when the lava dispatcher is controlling Nexus phones that are +# This is useful when the lava dispatcher is controlling the device under test which is # physically plugged to other machines by setting adb_command to something like # "ssh adb" and fastboot_command to something like "ssh # fastboot". adb and fastboot always operate on local files, so # you need your local files to also be seen as local files on the host where # adb/fastboot are executed. # -# In this case, you should set nexus_work_directory to a shared directory +# In this case, you should set shared_working_directory to a shared directory # between the machine running the dispatcher and the machine where the phone is # plugged. This shared directory must have the same path in both machines. # For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at # (or the other way around). -nexus_working_directory = +shared_working_directory = connection_command = %(adb_command)s shell === renamed file 'lava_dispatcher/device/nexus.py' => 'lava_dispatcher/device/fastboot.py' --- lava_dispatcher/device/nexus.py 2013-03-26 01:02:10 +0000 +++ lava_dispatcher/device/fastboot.py 2013-03-29 18:21:28 +0000 @@ -94,10 +94,10 @@ self('boot %s' % image) -class NexusTarget(Target): +class FastbootTarget(Target): def __init__(self, context, config): - super(NexusTarget, self).__init__(context, config) + super(FastbootTarget, self).__init__(context, config) if not config.hard_reset_command: logging.warn( @@ -192,13 +192,13 @@ @property def working_dir(self): - if (self.config.nexus_working_directory is None or - self.config.nexus_working_directory.strip() == ''): + if (self.config.shared_working_directory is None or + self.config.shared_working_directory.strip() == ''): return self.scratch_dir if self._working_dir is None: - self._working_dir = mkdtemp(self.config.nexus_working_directory) + self._working_dir = mkdtemp(self.config.shared_working_directory) return self._working_dir -target_class = NexusTarget +target_class = FastbootTarget