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

[Yongqin Liu]

Add the support for running by class and method for CTS test,
this will be helpful for try and investigate the class and method test case of CTS on lava.

tested it on my local

[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-27 03:52:59 +0000
+++ lava_android_test/test_definitions/cts/cts_wrapper.py	2013-05-06 08:29:28 +0000
@@ -104,7 +104,9 @@
     return True
 
 
-def run_cts_with_package(cts_cmd=None, package='CTS', timeout=36000):
+def run_cts_with_package(cts_cmd=None, package=None, timeout=36000):
+    if not package:
+        return True
     pattern = "Time:"
     plan_command = '--package %s' % package
     if cts_cmd:
@@ -117,6 +119,24 @@
     return True
 
 
+def run_cts_with_class(cts_cmd=None, cls=None, method=None, timeout=36000):
+    if not cls:
+        return True
+    pattern = "Time:"
+    cmd = '--class %s' % cls
+    if method:
+        cmd = '%s --method %s' % (cmd, method)
+
+    if cts_cmd:
+        cmd = "%s %s --disable-reboot" % (cts_cmd, cmd)
+    if not stop_at_cts_pattern(command=cmd, pattern=pattern,
+                            timeout=timeout):
+        print "CTS test times out"
+        return False
+
+    return True
+
+
 def run_cts_continue(cts_cmd=None):
     pattern = "Time:"
     continue_command = '--continue-session 0'
@@ -227,6 +247,8 @@
 
     package_name = None
     plan_name = 'CTS'
+    class_name= None
+    method_name = None
     timeout = 36000
     #--cts_pkg cts_package_file --package package_name --timeout 36000
     #--cts_pkg cts_package_file --plan plan_name --timeout 36000
@@ -245,6 +267,9 @@
         if timeout:
             timeout = int(timeout)
 
+        class_name = get_value_from_paras(paras=paras, option='--class')
+        method_name = get_value_from_paras(paras=paras, option='--method')
+
     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,
@@ -258,6 +283,9 @@
         if package_name:
             run_cts_with_package(cts_cmd=run_wrapper_cmd, package=package_name,
                                  timeout=timeout)
+        elif class_name:
+            run_cts_with_class(cts_cmd=run_wrapper_cmd, cls=class_name,
+                               method=method_name, timeout=timeout)
         else:
             run_cts_with_plan(cts_cmd=run_wrapper_cmd, plan=plan_name,
                               timeout=timeout)