From patchwork Wed Nov 16 03:57:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 5165 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 7416E23E06 for ; Wed, 16 Nov 2011 03:57:15 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 63571A1820F for ; Wed, 16 Nov 2011 03:57:15 +0000 (UTC) Received: by faaa26 with SMTP id a26so1611201faa.11 for ; Tue, 15 Nov 2011 19:57:15 -0800 (PST) Received: by 10.152.135.179 with SMTP id pt19mr18795230lab.47.1321415835175; Tue, 15 Nov 2011 19:57:15 -0800 (PST) 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.152.41.198 with SMTP id h6cs68012lal; Tue, 15 Nov 2011 19:57:15 -0800 (PST) Received: by 10.180.99.225 with SMTP id et1mr33140143wib.14.1321415833443; Tue, 15 Nov 2011 19:57:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id v44si13569614wec.22.2011.11.15.19.57.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Nov 2011 19:57:13 -0800 (PST) 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 1RQWca-0002Pp-TC for ; Wed, 16 Nov 2011 03:57:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id D0E9EE03B3 for ; Wed, 16 Nov 2011 03:57:12 +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: 157 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 157: Allow passing an option to the install step for lava-android-test Message-Id: <20111116035712.28493.5586.launchpad@ackee.canonical.com> Date: Wed, 16 Nov 2011 03:57:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14291"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 5a6070b6f1eb7edd58609cec724c7c6f61e9bf2d Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dispatcher/lava-android-test-install-option/+merge/81517 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Paul Larson (pwlars) ------------------------------------------------------------ revno: 157 [merge] committer: Paul Larson branch nick: lava-dispatcher timestamp: Tue 2011-11-15 21:55:04 -0600 message: Allow passing an option to the install step for lava-android-test modified: lava_dispatcher/actions/lava-android-test.py lava_dispatcher/actions/lava-test.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-android-test.py' --- lava_dispatcher/actions/lava-android-test.py 2011-10-27 02:28:52 +0000 +++ lava_dispatcher/actions/lava-android-test.py 2011-11-02 20:22:23 +0000 @@ -82,10 +82,12 @@ """ lava-test deployment to test image rootfs by chroot """ - def run(self, tests, timeout=2400): + def run(self, tests, option=None, timeout=2400): dev_name = self.is_ready_for_test() for test in tests: cmd = 'lava-android-test install %s -s %s' % (test, dev_name) + if option is not None: + cmd += ' -o ' + option rc = pexpect.run(cmd, timeout=None, logfile=sys.stdout, withexitstatus=True)[1] if rc != 0: raise OperationFailed("Failed to install test case(%s) on device(%s) with return value: %s" % (test, dev_name, rc)) === modified file 'lava_dispatcher/actions/lava-test.py' --- lava_dispatcher/actions/lava-test.py 2011-10-27 06:12:13 +0000 +++ lava_dispatcher/actions/lava-test.py 2011-11-02 20:22:23 +0000 @@ -86,7 +86,7 @@ def test_name(self, test_name, test_options = "", timeout=-1): return super(cmd_lava_test_run, self).test_name() + ' (%s)' % test_name - + def run(self, test_name, test_options = "", timeout=-1): logging.info("Executing lava_test_run %s command" % test_name) #Make sure in test image now @@ -101,7 +101,7 @@ if test_options != "": test_options = "-t '%s'" % test_options - + cmd = ('lava-test run %s %s -o %s/%s.bundle' % ( test_name, test_options, self.context.lava_result_dir, bundle_name)) try: