Merge lp:~liuyq0307/lava-android-test/cts-support-package into lp:lava-android-test

[Yongqin Liu]

add support for specifying following features from android-build:
1. run with plan or package
2. the plan name or the package name
3. the the timeout value for the cts command
4. change the method for specifing the cts package name to --cts-pkg.

Like, we can specify cts(--cts-pkg android-cts-4.2_r3-linux_x86-arm_patched.zip --package android.accounts) in the LAVA_TEST_PLAN on android-build page for run the CTS android.accounts package test with android-cts-4.2_r3-linux_x86-arm_patched.zip file.

BTW, this branch is still on local testing.
When finished will report the result here.

[Yongqin Liu (liuyq0307)]

review: Approve (self test)

=== modified file 'lava_android_test/test_definitions/cts/cts_wrapper.py'
--- lava_android_test/test_definitions/cts/cts_wrapper.py	2013-03-20 08:20:57 +0000
+++ lava_android_test/test_definitions/cts/cts_wrapper.py	2013-03-27 06:13:21 +0000
@@ -56,6 +56,7 @@
 
     return result
 
+
 def get_not_executed():
     list_result_path = os.path.join(curdir, 'cts_list_result_wrapper.sh')
     list_result_cmd = "bash %s" % list_result_path
@@ -83,20 +84,33 @@
     cts_helper_jar_path = os.path.join(curdir, 'ctshelper.jar')
     cts_prepare_cmd = "bash %s" % cts_prepare_path
     if not stop_at_pattern(command="%s %s %s" % (cts_prepare_cmd,
-                                              adb.get_serial(),cts_helper_jar_path),
+                                adb.get_serial(), cts_helper_jar_path),
                            timeout=18000):
         print "Preapration for CTS test times out"
         return False
     return True
 
 
-def run_cts_with_plan(cts_cmd=None):
-    pattern = "Time:"
-    plan_command = '--plan CTS'
-    if cts_cmd:
-        plan_command = "%s %s --disable-reboot" % (cts_cmd, plan_command)
-    if not stop_at_cts_pattern(command=plan_command, pattern=pattern,
-                            timeout=36000):
+def run_cts_with_plan(cts_cmd=None, plan='CTS', timeout=36000):
+    pattern = "Time:"
+    plan_command = '--plan %s' % plan
+    if cts_cmd:
+        plan_command = "%s %s --disable-reboot" % (cts_cmd, plan_command)
+    if not stop_at_cts_pattern(command=plan_command, pattern=pattern,
+                            timeout=timeout):
+        print "CTS test times out"
+        return False
+
+    return True
+
+
+def run_cts_with_package(cts_cmd=None, package='CTS', timeout=36000):
+    pattern = "Time:"
+    plan_command = '--package %s' % package
+    if cts_cmd:
+        plan_command = "%s %s --disable-reboot" % (cts_cmd, plan_command)
+    if not stop_at_cts_pattern(command=plan_command, pattern=pattern,
+                            timeout=timeout):
         print "CTS test times out"
         return False
 
@@ -195,10 +209,42 @@
         return package_list
 
 
+def get_value_from_paras(paras=[], option=None, default=None):
+    if not option:
+        return default
+
+    if not option in paras:
+        return default
+
+    index = paras.index(option)
+    if len(paras) > index + 1:
+        return paras[index + 1]
+
+    return default
+
+
 def main():
 
-    if len(sys.argv) == 3:
-        os.environ["cts_pkg"] = sys.argv[2]
+    package_name = None
+    plan_name = 'CTS'
+    timeout = 36000
+    #--cts_pkg cts_package_file --package package_name --timeout 36000
+    #--cts_pkg cts_package_file --plan plan_name --timeout 36000
+    if len(sys.argv) > 2:
+        paras = sys.argv[2:]
+        cts_pkg = get_value_from_paras(paras=paras, option='--cts-pkg')
+        if cts_pkg:
+            os.environ["cts_pkg"] = cts_pkg
+
+        package_name = get_value_from_paras(paras=paras, option='--package')
+        plan_name = get_value_from_paras(paras=paras,
+                                         option='--plan',
+                                         default='CTS')
+        timeout = get_value_from_paras(paras=paras, option='--timeout',
+                                       default=36000)
+        if timeout:
+            timeout = int(timeout)
+
     run_wrapper_path = os.path.join('./android-cts/tools/cts-tradefed ')
     run_wrapper_cmd = "%s" % run_wrapper_path
     run_wrapper_cmd = '%s run cts --serial %s' % (run_wrapper_cmd,
@@ -209,7 +255,13 @@
         sys.exit(1)
 
     try:
-            run_cts_with_plan(cts_cmd=run_wrapper_cmd)
+        if package_name:
+            run_cts_with_package(cts_cmd=run_wrapper_cmd, package=package_name,
+                                 timeout=timeout)
+        else:
+            run_cts_with_plan(cts_cmd=run_wrapper_cmd, plan=plan_name,
+                              timeout=timeout)
+
     finally:
         for log in logs:
             pid = log.get('pid')