From patchwork Fri Nov 18 03:11:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 5193 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 AA7A223FFE for ; Fri, 18 Nov 2011 03:11:26 +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 8ED26A1818D for ; Fri, 18 Nov 2011 03:11:26 +0000 (UTC) Received: by faaa26 with SMTP id a26so6860825faa.11 for ; Thu, 17 Nov 2011 19:11:26 -0800 (PST) Received: by 10.152.144.136 with SMTP id sm8mr766466lab.33.1321585886347; Thu, 17 Nov 2011 19:11:26 -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 h6cs164486lal; Thu, 17 Nov 2011 19:11:25 -0800 (PST) Received: by 10.180.0.14 with SMTP id 14mr1076111wia.65.1321585884263; Thu, 17 Nov 2011 19:11:24 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id c14si17489856wbh.125.2011.11.17.19.11.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 Nov 2011 19:11:24 -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 1RRErL-0005RJ-O8 for ; Fri, 18 Nov 2011 03:11:23 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id AC6C1E1573 for ; Fri, 18 Nov 2011 03:11:23 +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: 164 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 164: have soft_reboot look for a message that both android and regular images print Message-Id: <20111118031123.17954.19899.launchpad@ackee.canonical.com> Date: Fri, 18 Nov 2011 03:11:23 -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: 70166c4c9bf9c229a02f25e3dad9de0c60ceddff ------------------------------------------------------------ revno: 164 committer: Michael Hudson-Doyle branch nick: trunk timestamp: Fri 2011-11-18 16:09:38 +1300 message: have soft_reboot look for a message that both android and regular images print modified: 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/connection.py' --- lava_dispatcher/connection.py 2011-10-27 06:12:13 +0000 +++ lava_dispatcher/connection.py 2011-11-18 03:09:38 +0000 @@ -68,7 +68,7 @@ # set soft reboot timeout 120s, or do a hard reset logging.info("Rebooting the system") id = self.proc.expect( - ['Will now restart', pexpect.TIMEOUT], timeout=120) + ['Restarting system.', pexpect.TIMEOUT], timeout=120) if id != 0: self.hard_reboot()