From patchwork Wed Jun 6 03:18:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqin Liu X-Patchwork-Id: 9135 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 7A92123E1B for ; Wed, 6 Jun 2012 03:18:16 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2700AA18647 for ; Wed, 6 Jun 2012 03:18:16 +0000 (UTC) Received: by yenq6 with SMTP id q6so5190612yen.11 for ; Tue, 05 Jun 2012 20:18:15 -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=MyLjew6g/Y796Dvb6NlhjlY6noq+Ij8WO5ZzTA16UPA=; b=EBqykZd/s46EtG1X53V9UKtglVEdjhgyJ2fPl2qa7oBVH68QUfNjrVbKxJA9lNTzDU AhYBh21IyFqiYicZ4xKXQU4DE6zqV6BYOL5mGV+BVOlXe8zosVSjNqDqdhhpCQHdhm+h 1jN2iupbQ2AuqskxAu7WgiMFWvqVvdsvp4suzzLfJUHyBjEbHOWIvT4Aotd94i1qEKEI +yNDNk9AKw6jHAsZaxsyfGvIks9/e+GFyZEDTZsB7VOOhDXIy1lQxbUYvcv6ZQNcV0jy KydEadOqr6cgNkkivS35gcwzt3EogHJHnvoBm25sEpQ1vhnWsgVavmT3YyJ8xQKBqXlL ssfA== Received: by 10.50.195.234 with SMTP id ih10mr5267481igc.0.1338952695364; Tue, 05 Jun 2012 20:18:15 -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.24.148 with SMTP id v20csp59899ibb; Tue, 5 Jun 2012 20:18:14 -0700 (PDT) Received: by 10.14.127.205 with SMTP id d53mr8711076eei.7.1338952694054; Tue, 05 Jun 2012 20:18:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fa8si1247810wib.3.2012.06.05.20.18.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 20:18:14 -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 1Sc6lA-0001ON-Qk for ; Wed, 06 Jun 2012 03:18:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C079CE002E for ; Wed, 6 Jun 2012 03:18: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: 315 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 315: merge the branch that fix the timeout problem of wait_home_screen for android Message-Id: <20120606031812.349.34047.launchpad@ackee.canonical.com> Date: Wed, 06 Jun 2012 03:18: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="15353"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 03c972b175af0c4895325a7acd29c91a5db75291 X-Gm-Message-State: ALoCoQnREDUh9uwSPnD661xSK6OIKczSxufO0SKKlgEH4Xj+yDR6HInY0+jcjcnckx+g7xtA5fQH Merge authors: Yongqin Liu (liuyq0307) Related merge proposals: https://code.launchpad.net/~liuyq0307/lava-dispatcher/timeout_wait_home_screen/+merge/108138 proposed by: Yongqin Liu (liuyq0307) review: Approve - Michael Hudson-Doyle (mwhudson) review: Approve - Yongqin Liu (liuyq0307) review: Needs Information - Zygmunt Krynicki (zkrynicki) https://code.launchpad.net/~liuyq0307/lava-dispatcher/disable_suspend_first/+merge/106316 proposed by: Yongqin Liu (liuyq0307) ------------------------------------------------------------ revno: 315 [merge] committer: Yongqin Liu branch nick: lava-dispatcher timestamp: Wed 2012-06-06 11:15:25 +0800 message: merge the branch that fix the timeout problem of wait_home_screen for android modified: 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/client/base.py' --- lava_dispatcher/client/base.py 2012-05-23 21:49:59 +0000 +++ lava_dispatcher/client/base.py 2012-05-31 10:43:31 +0000 @@ -235,10 +235,12 @@ def wait_home_screen(self): cmd = 'getprop init.svc.bootanim' for count in range(100): - self.run(cmd, response=['stopped', pexpect.TIMEOUT], timeout=5) - if self.match_id == 0: - return True - time.sleep(1) + try: + self.run(cmd, response=['stopped'], timeout=5) + if self.match_id == 0: + return True + except pexpect.TIMEOUT: + time.sleep(1) raise GeneralError('The home screen has not displayed') def check_device_state(self): @@ -439,12 +441,12 @@ self.proc.expect(self.tester_str, timeout=120) #TODO: set up proxy + self._disable_suspend() if self.config.get("enable_network_after_boot_android"): time.sleep(1) self._enable_network() self._enable_adb_over_tcpip() - self._disable_suspend() def _disable_suspend(self): """ disable the suspend of images.