From patchwork Mon Nov 21 23:08: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: 5247 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 CC2CB23E07 for ; Mon, 21 Nov 2011 23:08: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 B198AA184BB for ; Mon, 21 Nov 2011 23:08:15 +0000 (UTC) Received: by faaa26 with SMTP id a26so11679522faa.11 for ; Mon, 21 Nov 2011 15:08:15 -0800 (PST) Received: by 10.152.111.170 with SMTP id ij10mr7120247lab.5.1321916895494; Mon, 21 Nov 2011 15:08: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 h6cs148637lal; Mon, 21 Nov 2011 15:08:15 -0800 (PST) Received: by 10.181.13.82 with SMTP id ew18mr16708382wid.16.1321916893057; Mon, 21 Nov 2011 15:08:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id cf10si5686950wib.83.2011.11.21.15.08.12 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 Nov 2011 15:08: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 1RScyC-0000em-HI for ; Mon, 21 Nov 2011 23:08:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 79FC2E04E8 for ; Mon, 21 Nov 2011 23:08: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: 166 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 166: increase boot timeout for android to 900, a few other random boot related fixes Message-Id: <20111121230812.915.91067.launchpad@ackee.canonical.com> Date: Mon, 21 Nov 2011 23:08: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="14299"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 599bb6a5135c51505a98bc4dd37d6a13b612ac89 ------------------------------------------------------------ revno: 166 committer: Paul Larson branch nick: lava-dispatcher timestamp: Mon 2011-11-21 17:06:03 -0600 message: increase boot timeout for android to 900, a few other random boot related fixes modified: lava_dispatcher/client.py lava_dispatcher/connection.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.py' --- lava_dispatcher/client.py 2011-11-16 04:54:54 +0000 +++ lava_dispatcher/client.py 2011-11-21 23:06:03 +0000 @@ -119,7 +119,7 @@ self.proc.soft_reboot() try: self.proc.expect("Starting kernel") - self.in_master_shell(120) + self.in_master_shell(300) except: logging.exception("in_master_shell failed") self.proc.hard_reboot() @@ -233,7 +233,7 @@ def boot_linaro_android_image(self): """Reboot the system to the test android image.""" self.proc._boot(string_to_list(self.config.get('boot_cmds_android'))) - self.in_test_shell() + self.in_test_shell(timeout=900) self.proc.sendline("export PS1=\"root@linaro: \"") self.enable_adb_over_tcpip() === modified file 'lava_dispatcher/connection.py' --- lava_dispatcher/connection.py 2011-11-18 03:09:38 +0000 +++ lava_dispatcher/connection.py 2011-11-21 23:06:03 +0000 @@ -68,8 +68,9 @@ # set soft reboot timeout 120s, or do a hard reset logging.info("Rebooting the system") id = self.proc.expect( - ['Restarting system.', pexpect.TIMEOUT], timeout=120) - if id != 0: + ['Restarting system.', 'The system is going down for reboot NOW', + pexpect.TIMEOUT], timeout=120) + if id not in [0,1]: self.hard_reboot() def hard_reboot(self):