Merge lp:~jeremychang/lava-dispatcher/android-support into lp:lava-dispatcher

[Jeremy Chang]

Some more changes:
 1. Clean up unnecessary import.

 2. Add adb disconnect function.

 3. Stabilize the result of the basic test.

(I think I should not push changes to merged branch.)

[lp:~jeremychang/lava-dispatcher/android-support]

53. By Jeremy Chang on 2011-05-26

run_adb_shell_command implemented in android client.

adb should be just handled by the client.

54. By Jeremy Chang on 2011-05-26

Move check_adb_status to android client

check_adb_status function can be shared and should be put in android client.

55. By Jeremy Chang on 2011-05-26

Remove the commented out stuff in android_0xbench.py

=== modified file 'lava/dispatcher/actions/android_0xbench.py'
--- lava/dispatcher/actions/android_0xbench.py	2011-05-20 23:17:54 +0000
+++ lava/dispatcher/actions/android_0xbench.py	2011-05-26 19:08:41 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/python
 from lava.dispatcher.actions import BaseAndroidAction
-from lava.dispatcher.client import OperationFailed
-from lava.dispatcher.android_config import TESTER_STR
 import time
 import pexpect
-import sys
-from datetime import datetime
-from lava.dispatcher.android_util import savebundlefile
 
 class cmd_test_android_0xbench(BaseAndroidAction):
     def run(self):
 
=== modified file 'lava/dispatcher/actions/android_basic.py'
--- lava/dispatcher/actions/android_basic.py	2011-05-20 17:04:08 +0000
+++ lava/dispatcher/actions/android_basic.py	2011-05-26 19:08:41 +0000
@@ -52,7 +52,7 @@
 
         #TODO: Checking if sdcard is mounted by vold to replace sleep idle, or check the Home app status
         # Give time for Android system to boot up, then test
-        time.sleep(30)
+        time.sleep(60)
         TIMEFORMAT = '%Y-%m-%dT%H:%M:%SZ'
         starttime = datetime.utcnow()
         timestring = datetime.strftime(starttime, TIMEFORMAT)
@@ -118,7 +118,7 @@
 
         #TODO: Wait for boot completed, if timeout, do logcat and save as booting fail log
 
-        adb_status = self.check_adb_status()
+        adb_status = self.client.check_adb_status()
         test_case_result = {}
         test_case_result['test_case_id'] = "adb connection status"
         if adb_status:
@@ -129,34 +129,3 @@
         results['test_results'].append(test_case_result)
         savebundlefile("basic", results, timestring)
         self.client.proc.sendline("")
-
-    def check_adb_status(self):
-        # XXX: IP could be assigned in other way in the validation farm
-        try:
-            self.client.run_shell_command('netcfg %s dhcp' % \
-                self.network_interface, response = TESTER_STR, timeout = 60)
-        except:
-            print "netcfg %s dhcp exception" % self.network_interface
-            return False
-
-        # Check network ip and setup adb connection
-        ip_pattern = "(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})"
-        cmd = "ifconfig %s" % self.network_interface
-        self.client.proc.sendline(cmd)
-        try:
-            id = self.client.proc.expect([ip_pattern, pexpect.EOF], timeout = 5)
-        except:
-            return False
-        if id == 0:
-            match_group = self.client.proc.match.groups()
-            if len(match_group) > 0:
-                device_ip = match_group[0]
-                adb_status, dev_name = self.client.check_android_adb_network_up(device_ip)
-                if adb_status == True:
-                    print "dev_name = " + dev_name
-                    cmd = "adb -s %s shell echo 1" % dev_name
-                    self.adb_proc = pexpect.spawn(cmd, timeout=5, logfile=sys.stdout)
-                    id = self.adb_proc.expect(["1", "error"], timeout=5)
-                    if id == 0:
-                        return True
-        return False
 
=== modified file 'lava/dispatcher/android_client.py'
--- lava/dispatcher/android_client.py	2011-05-19 16:25:37 +0000
+++ lava/dispatcher/android_client.py	2011-05-26 19:08:41 +0000
@@ -8,8 +8,16 @@
         super(LavaAndroidClient, self).__init__(hostname)
         self.board = BOARDS[hostname]
 
-    def run_adb_shell_command(self, cmd, response=None, timeout=-1):
-        pass
+    def run_adb_shell_command(self, dev_id, cmd, response, timeout=-1):
+        adb_cmd = "adb -s %s shell %s" % (dev_id, cmd)
+        try:
+            adb_proc = pexpect.spawn(adb_cmd, logfile=sys.stdout)
+            id = adb_proc.expect([response, pexpect.EOF], timeout=timeout)
+            if id == 0:
+                return True
+        except pexpect.TIMEOUT:
+            pass
+        return False
 
     def in_test_shell(self):
         """ Check that we are in a shell on the test image
@@ -59,7 +67,7 @@
         print "logcat cancelled"
 
     # adb cound be connected through network
-    def check_android_adb_network_up(self, dev_ip):
+    def android_adb_connect(self, dev_ip):
         pattern1 = "connected to (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5})"
         pattern2 = "already connected to (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5})"
         pattern3 = "unable to connect to"
@@ -73,3 +81,38 @@
         else:
             return False, None
 
+    def android_adb_disconnect(self, dev_ip):
+        cmd = "adb disconnect %s" % dev_ip
+        adb_proc = pexpect.run(cmd, timeout=300, logfile=sys.stdout)
+
+    def check_adb_status(self):
+        # XXX: IP could be assigned in other way in the validation farm
+        network_interface = self.board.network_interface 
+        try:
+            self.run_shell_command('netcfg %s dhcp' % \
+                network_interface, response = TESTER_STR, timeout = 60)
+        except:
+            print "netcfg %s dhcp exception" % network_interface
+            return False
+
+        # Check network ip and setup adb connection
+        ip_pattern = "(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})"
+        cmd = "ifconfig %s" % network_interface
+        self.proc.sendline('')
+        self.proc.sendline(cmd)
+        try:
+            id = self.proc.expect([ip_pattern, pexpect.EOF], timeout = 60)
+        except:
+            print "ifconfig can not match ip pattern"
+            return False
+        if id == 0:
+            match_group = self.proc.match.groups()
+            if len(match_group) > 0:
+                device_ip = match_group[0]
+                adb_status, dev_name = self.android_adb_connect(device_ip)
+                if adb_status == True:
+                    print "dev_name = " + dev_name
+                    result = self.run_adb_shell_command(dev_name, "echo 1", "1")
+                    self.android_adb_disconnect(device_ip)
+                    return result
+        return False
 
=== modified file 'lava/dispatcher/android_config.py'
--- lava/dispatcher/android_config.py	2011-05-20 23:07:47 +0000
+++ lava/dispatcher/android_config.py	2011-05-26 19:08:41 +0000
@@ -11,6 +11,7 @@
         "init=/init androidboot.console=ttyO2'",
         "boot"]
     type = "beagle"
+    network_interface = "eth0"
 
 
 class PandaBoard(Board):
@@ -25,6 +26,9 @@
         "init=/init androidboot.console=ttyO2'",
         "boot"]
     type = "panda"
+    network_interface = "eth0"
+
+
 #Here, it still needs to maintain a map from boardid to board, for there is only
 #boardid in jobfile.json
 BOARDS = {