From patchwork Tue Feb 19 06:28:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Baker X-Patchwork-Id: 14981 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 9FC0423E0B for ; Tue, 19 Feb 2013 06:28:15 +0000 (UTC) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by fiordland.canonical.com (Postfix) with ESMTP id 3A27CA18CC8 for ; Tue, 19 Feb 2013 06:28:15 +0000 (UTC) Received: by mail-vc0-f181.google.com with SMTP id f13so886257vcb.12 for ; Mon, 18 Feb 2013 22:28:14 -0800 (PST) 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=RC6VRb9bCJ1pRJzsD5LWKDBDzt7njb6E8tvwAw4eGsw=; b=DvUazTicVJBOJNHsxWXBcH84lePmhMtSXPVcAkGnoprwuiBU93aW+hdWuNk3+i4txp G3ItNTFI7mc6fBF1gODr/eGSS26tWD4Zyj2ageHeC8S1g8+kl2DW0UFaBzdW5EBjwVRh UG6kJv7pvOOJ77sm/vbANNdGEfnYY5EeG+bVNEaQiyfjbYsyScARZ8hAdbtYDYWfexo1 iVrMBVXxSuvqgvJRNC496dEMY4CtoOBVvmnwRBRrfrWkG/TRJVwggU6bc4cCbd8SqBm6 8Ipa4eWddWVI5+69kX2/0ifWxI8NcdFsoLTK1Hdb5t9FJQ9pQD+yx4DAQG+VjhIp27rt ljxw== X-Received: by 10.52.177.163 with SMTP id cr3mr16661979vdc.94.1361255294748; Mon, 18 Feb 2013 22:28:14 -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.58.145.101 with SMTP id st5csp125751veb; Mon, 18 Feb 2013 22:28:14 -0800 (PST) X-Received: by 10.194.88.202 with SMTP id bi10mr23871428wjb.5.1361255293705; Mon, 18 Feb 2013 22:28:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fu5si4681660wib.94.2013.02.18.22.28.13 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 Feb 2013 22:28: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 1U7ggX-0000FS-18 for ; Tue, 19 Feb 2013 06:28:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id EB454E061B for ; Tue, 19 Feb 2013 06:28: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: 563 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 563: Allow user to define the activity to wait for on boot. Message-Id: <20130219062812.32460.44439.launchpad@ackee.canonical.com> Date: Tue, 19 Feb 2013 06:28: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="16491"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 78fec80fd409360b1a1f70b4ed5cfe5cb2e08cce X-Gm-Message-State: ALoCoQmWBxq+jD/2iMbuZX9unORkOcnhVEPGnP6tKPVZ/uT/wCiH1YYRVHf1wYUvGJpY017BvIqC Merge authors: Tyler Baker (tyler-baker) Related merge proposals: https://code.launchpad.net/~tyler-baker/lava-dispatcher/android-wait-for-homescreen-extension/+merge/148986 proposed by: Tyler Baker (tyler-baker) review: Approve - Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 563 [merge] committer: Tyler Baker branch nick: trunk timestamp: Mon 2013-02-18 22:26:39 -0800 message: Allow user to define the activity to wait for on boot. modified: lava_dispatcher/client/base.py lava_dispatcher/config.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/client/base.py' --- lava_dispatcher/client/base.py 2013-01-23 17:52:50 +0000 +++ lava_dispatcher/client/base.py 2013-02-18 06:00:28 +0000 @@ -294,12 +294,11 @@ def wait_home_screen(self): timeout = self._client.config.android_home_screen_timeout - launcher_pat = ('Displayed com.android.launcher/' - 'com.android.launcher2.Launcher:') + activity_pat = self._client.config.android_wait_for_home_screen_activity #waiting for the home screen displayed try: self.run('logcat -s ActivityManager:I', - response=[launcher_pat], + response=[activity_pat], timeout=timeout, wait_prompt=False) except pexpect.TIMEOUT: raise GeneralError('The home screen has not displayed') === modified file 'lava_dispatcher/config.py' --- lava_dispatcher/config.py 2013-01-21 13:11:47 +0000 +++ lava_dispatcher/config.py 2013-02-18 06:00:28 +0000 @@ -83,6 +83,7 @@ android_adb_over_usb = schema.BoolOption(default=False) android_adb_over_tcp = schema.BoolOption(default=True) android_wait_for_home_screen = schema.BoolOption(default=True) + android_wait_for_home_screen_activity = schema.StringOption(default="Displayed com.android.launcher/com.android.launcher2.Launcher:") android_home_screen_timeout = schema.IntOption(default=1800) android_boot_prompt_timeout = schema.IntOption(default=1200) android_orig_block_device = schema.StringOption(default="mmcblk0")