From patchwork Wed Jun 29 10:27:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 2368 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 C9DDC23F08 for ; Wed, 29 Jun 2011 10:27:34 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 7D85FA18468 for ; Wed, 29 Jun 2011 10:27:34 +0000 (UTC) Received: by qwb8 with SMTP id 8so762469qwb.11 for ; Wed, 29 Jun 2011 03:27:34 -0700 (PDT) Received: by 10.229.102.98 with SMTP id f34mr452952qco.42.1309343253862; Wed, 29 Jun 2011 03:27:33 -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.229.48.135 with SMTP id r7cs36024qcf; Wed, 29 Jun 2011 03:27:33 -0700 (PDT) Received: by 10.227.182.79 with SMTP id cb15mr565913wbb.49.1309343252440; Wed, 29 Jun 2011 03:27:32 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id ej18si2239905wbb.134.2011.06.29.03.27.32; Wed, 29 Jun 2011 03:27:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QbrzV-0006DM-2h for ; Wed, 29 Jun 2011 10:27:29 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 02D8E2E8960 for ; Wed, 29 Jun 2011 10:27:17 +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: 72 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 72: Strangeness on prompt detection happens sometimes, and it's really Message-Id: <20110629102717.23510.7708.launchpad@loganberry.canonical.com> Date: Wed, 29 Jun 2011 10:27:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13265"; Instance="initZopeless config overlay" X-Launchpad-Hash: b51cdf5e8328e1f39d77da2eaea9e04134d7a7a0 ------------------------------------------------------------ revno: 72 tags: 2011.06 committer: Paul Larson branch nick: lava-dispatcher timestamp: Wed 2011-06-29 11:22:40 +0100 message: Strangeness on prompt detection happens sometimes, and it's really strange that we tell android what it's prompt is, but we force it to be something different. This makes the prompt used on test images the same. modified: lava_dispatcher/actions/android_deploy.py lava_dispatcher/android_client.py lava_dispatcher/android_config.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/actions/android_deploy.py' --- lava_dispatcher/actions/android_deploy.py 2011-06-27 04:55:08 +0000 +++ lava_dispatcher/actions/android_deploy.py 2011-06-29 10:22:40 +0000 @@ -138,7 +138,7 @@ 'sed -i "s/mmcblk0p2/mmcblk0p5/g" init.rc', response = MASTER_STR) client.run_shell_command( - 'sed -i "/export PATH/a \ \ \ \ export PS1 android# " init.rc', + 'sed -i "/export PATH/a \ \ \ \ export PS1 root@linaro: " init.rc', response = MASTER_STR) client.run_shell_command( === modified file 'lava_dispatcher/android_client.py' --- lava_dispatcher/android_client.py 2011-06-27 04:55:08 +0000 +++ lava_dispatcher/android_client.py 2011-06-29 10:22:40 +0000 @@ -42,7 +42,7 @@ """ Check that we are in a shell on the test image """ self.proc.sendline("") - id = self.proc.expect(["android#", pexpect.TIMEOUT]) + id = self.proc.expect([TESTER_STR , pexpect.TIMEOUT]) if id == 1: raise OperationFailed @@ -61,7 +61,7 @@ self.proc.expect("#") self.proc.sendline(uboot_cmds[line]) self.in_test_shell() - self.proc.sendline("export PS1=\"android# \"") + self.proc.sendline("export PS1=\"root@linaro: \"") def android_logcat_clear(self): cmd = "logcat -c" === modified file 'lava_dispatcher/android_config.py' --- lava_dispatcher/android_config.py 2011-06-27 04:55:08 +0000 +++ lava_dispatcher/android_config.py 2011-06-29 10:22:40 +0000 @@ -55,7 +55,10 @@ BOARDS = { "beagle01": BeagleBoard, "panda01": PandaBoard, + "panda02": PandaBoard, + "panda03": PandaBoard, + "panda04": PandaBoard, } #Test image recognization string -TESTER_STR = "android# " +TESTER_STR = "root@linaro:" === modified file 'lava_dispatcher/config.py' --- lava_dispatcher/config.py 2011-06-23 19:38:42 +0000 +++ lava_dispatcher/config.py 2011-06-29 10:22:40 +0000 @@ -85,6 +85,8 @@ BOARDS = { "panda01": PandaBoard, "panda02": PandaBoard, + "panda03": PandaBoard, + "panda04": PandaBoard, "beaglexm01": BeagleBoard, "mx51evk01": Mx51evkBoard, "mx53loco01": Mx53locoBoard,