Merge lp:~vishalbhoj/lava-android-test/CTS-update-for-juice into lp:lava-android-test

[vishal]

Updates to CTS. Enables few settings needed for CTS. Runs CTS in foreground and doesn't invoke from shell script anymore.

[Yongqin Liu (liuyq0307)]

will approve this after my local test finished

[Yongqin Liu (liuyq0307)]

from source it's ok.
and this change is related to CTS test only,
so will merge it first,
and test it on other builds.

review: Approve

=== modified file 'lava_android_test/test_definitions/cts.py'
--- lava_android_test/test_definitions/cts.py	2012-06-28 11:29:49 +0000
+++ lava_android_test/test_definitions/cts.py	2013-03-20 08:29:31 +0000
@@ -33,7 +33,7 @@
 
 curdir = os.path.realpath(os.path.dirname(__file__))
 
-RUN_STEPS_HOST_PRE = ['python %s/cts/cts_wrapper.py $(SERIAL)' % curdir]
+RUN_STEPS_HOST_PRE = ['python %s/cts/cts_wrapper.py $(SERIAL) $(OPTIONS)' % curdir]
 
 inst = lava_android_test.testdef.AndroidTestInstaller()
 run = lava_android_test.testdef.AndroidTestRunner(
@@ -41,7 +41,7 @@
 
 #01-16 14:24:16 I/0123456789ABCDEF: android.telephony.cts.
 #TelephonyManagerTest#testGetNetworkCountryIso PASS
-pattern = ("^\s*[\d-]+\s+[\d:]+\s+I\/\S+\:\s+(?P<test_case_id>\S+#\S+)"
+pattern = ("\s*[\d-]+\s+[\d:]+\s+I\/\S+\:\s+(?P<test_case_id>\S+#\S+)"
            "\s+(?P<result>\S+)\s*$")
 parser = lava_android_test.testdef.AndroidTestParser(pattern=pattern,
                             fixupdict={'PASS': 'pass', 'FAIL': 'fail'})
 
=== modified file 'lava_android_test/test_definitions/cts/cts_prepare.sh'
--- lava_android_test/test_definitions/cts/cts_prepare.sh	2012-11-15 05:40:30 +0000
+++ lava_android_test/test_definitions/cts/cts_prepare.sh	2013-03-20 08:29:31 +0000
@@ -19,8 +19,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #http://source.android.com/compatibility/downloads.html
-
+if [ -z "$cts_pkg" ]; then
 cts_pkg="android-cts-linux_x86-arm-latest.zip"
+fi
 media_pkg="android-cts-media-latest.zip"
 site_url="http://testdata.validation.linaro.org/cts/"
 #site_url="http://192.168.1.127/images/cts/"
@@ -106,7 +107,11 @@
         echo "Faild to install CtsDelegatingAccessibilityService.apk"
         exit 1
     fi
-    ##TODO On the device, enable Settings > Accessibility > DelegatingAccessibility Service
+    ## On the device, enable Settings > Accessibility > DelegatingAccessibility Service
+    ${ADB_CMD} push $2 /data/local/tmp/
+    ${ADB_CMD} shell am start  -a android.intent.action.VIEW -n com.android.settings/.Settings
+    ${ADB_CMD} shell uiautomator runtest ctshelper.jar -c com.linaro.ctshelper#AccessibilityHelper
+
 	
     #16. Set up device administration tests:
     echo "${ADB_CMD} install -r android-cts/repository/testcases/CtsDeviceAdmin.apk"
@@ -115,7 +120,10 @@
         echo "Faild to install CtsDeviceAdmin.apk"
         exit 1
     fi
-    ##TODO On the device, enable Settings > Security > Device Administrators >android.deviceadmin.cts.CtsDeviceAdmin* settings
+    ## On the device, enable Settings > Security > Device Administrators >android.deviceadmin.cts.CtsDeviceAdmin* settings
+    ${ADB_CMD} shell am start  -a android.intent.action.VIEW -n com.android.settings/.Settings
+    ${ADB_CMD} shell uiautomator runtest ctshelper.jar -c com.linaro.ctshelper#SecurityHelper
+    ${ADB_CMD} shell am start  -a android.intent.action.VIEW -n com.android.launcher/com.android.launcher2.Launcher
 	
 	exit 0
 }
 
=== modified file 'lava_android_test/test_definitions/cts/cts_wrapper.py'
--- lava_android_test/test_definitions/cts/cts_wrapper.py	2013-02-19 16:54:47 +0000
+++ lava_android_test/test_definitions/cts/cts_wrapper.py	2013-03-20 08:29:31 +0000
@@ -43,18 +43,14 @@
 
     result = True
     proc_cts = pexpect.spawn(command, logfile=sys.stdout)
-    time.sleep(20)
-    dump_log_cmd =  "tail -f ./cts_output.log"
-    proc = pexpect.spawn(dump_log_cmd, logfile=sys.stdout)
+    time.sleep(200)
     try:
-        match_id = proc.expect(response, timeout=timeout)
+        match_id = proc_cts.expect(response, timeout=timeout)
         if match_id == 0:
             time.sleep(5)
     except pexpect.TIMEOUT:
         result = False
     finally:
-        proc.sendcontrol('C')
-        proc.sendline('')
         proc_cts.sendcontrol('C')
         proc_cts.sendline('')
 
@@ -84,9 +80,10 @@
 
 def prepare_cts():
     cts_prepare_path = os.path.join(curdir, 'cts_prepare.sh')
+    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" % (cts_prepare_cmd,
-                                              adb.get_serial()),
+    if not stop_at_pattern(command="%s %s %s" % (cts_prepare_cmd,
+                                              adb.get_serial(),cts_helper_jar_path),
                            timeout=18000):
         print "Preapration for CTS test times out"
         return False
@@ -97,7 +94,7 @@
     pattern = "Time:"
     plan_command = '--plan CTS'
     if cts_cmd:
-        plan_command = "%s %s" % (cts_cmd, plan_command)
+        plan_command = "%s %s --disable-reboot" % (cts_cmd, plan_command)
     if not stop_at_cts_pattern(command=plan_command, pattern=pattern,
                             timeout=36000):
         print "CTS test times out"
@@ -106,21 +103,6 @@
     return True
 
 
-def run_cts_with_package(cts_cmd=None, package=None):
-    pattern = "I/CommandScheduler: All done"
-    if not package:
-        return False
-    package_command = '--package %s' % package
-    if cts_cmd:
-        cts_command = "%s %s" % (cts_cmd, package_command)
-    if not stop_at_cts_pattern(command=cts_command, pattern=pattern,
-                            timeout=36000):
-        print "CTS test times out"
-        return False
-
-    return True
-
-
 def run_cts_continue(cts_cmd=None):
     pattern = "Time:"
     continue_command = '--continue-session 0'
@@ -214,8 +196,11 @@
 
 
 def main():
-    run_wrapper_path = os.path.join(curdir, 'cts_run_wrapper.sh')
-    run_wrapper_cmd = "bash %s" % run_wrapper_path
+
+    if len(sys.argv) == 3:
+        os.environ["cts_pkg"] = sys.argv[2]
+    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,
                                                       adb.get_serial())
 
@@ -223,13 +208,8 @@
     if not prepare_cts():
         sys.exit(1)
 
-    cts_plan = './android-cts/repository/plans/CTS.xml'
-    pkg_list = get_all_packages(plan_file=cts_plan)
     try:
-        for pkg in pkg_list:
-            run_cts_with_package(cts_cmd=run_wrapper_cmd, package=pkg)
-            #if not run_cts_with_package(cts_cmd=run_wrapper_cmd, package=pkg):
-                #run_cts_continue(run_wrapper_cmd)
+            run_cts_with_plan(cts_cmd=run_wrapper_cmd)
     finally:
         for log in logs:
             pid = log.get('pid')
 
=== added file 'lava_android_test/test_definitions/cts/ctshelper.jar'
 Binary files lava_android_test/test_definitions/cts/ctshelper.jar	1970-01-01 00:00:00 +0000 and lava_android_test/test_definitions/cts/ctshelper.jar	2013-03-20 08:29:31 +0000 differ