[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
State Accepted
Headers show

Commit Message

Paul Larson June 29, 2011, 10:27 a.m.
------------------------------------------------------------
revno: 72
tags: 2011.06
committer: Paul Larson <paul.larson@canonical.com>
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

Patch

=== 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,