Merge lp:~liuyq0307/lava-android-test/cts-4_1_r1 into lp:lava-android-test

[Yongqin Liu]

update to use the latest 4.1.r1 package that google provided

[Michael Hudson-Doyle (mwhudson)]

I don't feel particularly qualified to review this, but it looks OK I
guess. We're not actually running CTS currently, right?

[Yongqin Liu (liuyq0307)]

> I don't feel particularly qualified to review this, but it looks OK I
> guess. We're not actually running CTS currently, right?

Yes, we are not running the CTS because the bug it consumes the CPU.
But this branch is not for that problem, it is just updated to use the latest cts-4_1_r1 CTS package.

And I want to investigate the CTS consumes CPU problem based on this branch with the latest CTS package

[Yongqin Liu (liuyq0307)]

Sorry, this is the CTS consumes CPU bug:
https://bugs.launchpad.net/linaro-android/+bug/1034218

[Michael Hudson-Doyle (mwhudson)]

Yongqin Liu <email address hidden> writes:

>> I don't feel particularly qualified to review this, but it looks OK I
>> guess. We're not actually running CTS currently, right?
>
> Yes, we are not running the CTS because the bug it consumes the CPU.
> But this branch is not for that problem, it is just updated to use the latest cts-4_1_r1 CTS package.
>
> And I want to investigate the CTS consumes CPU problem based on this branch with the latest CTS package

Fair enough. Merge away then :-)

=== modified file 'lava_android_test/test_definitions/cts/cts_prepare.sh'
--- lava_android_test/test_definitions/cts/cts_prepare.sh	2012-06-26 03:38:38 +0000
+++ lava_android_test/test_definitions/cts/cts_prepare.sh	2012-10-08 07:12:20 +0000
@@ -20,9 +20,9 @@
 
 #http://source.android.com/compatibility/downloads.html
 
-cts_pkg="android-cts-4.0.3_r3-linux_x86-arm.zip"
-media_pkg="android-cts-media-1.0.zip"
-site_url="https://dl.google.com/dl/android/cts/"
+cts_pkg="android-cts-linux_x86-arm-latest.zip"
+media_pkg="android-cts-media-latest.zip"
+site_url="http://testdata.validation.linaro.org/cts/"
 #site_url="http://192.168.1.127/images/cts/"
 #export http_proxy=http://localhost:3128
 

=== modified file 'lava_android_test/test_definitions/cts/cts_wrapper.py'
--- lava_android_test/test_definitions/cts/cts_wrapper.py	2012-06-27 08:32:16 +0000
+++ lava_android_test/test_definitions/cts/cts_wrapper.py	2012-10-08 07:12:20 +0000
@@ -22,6 +22,7 @@
 import os
 import re
 import sys
+import xml.dom.minidom
 from lava_android_test.adb import ADB
 from lava_android_test.utils import stop_at_pattern
 
@@ -75,6 +76,21 @@
     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_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'
@@ -147,6 +163,26 @@
                 print '<<<<<=========Log file [%s] ends=========' % log_file
 
 
+def get_all_packages(plan_file=None):
+    if not plan_file:
+        return []
+    if not os.path.exists(plan_file):
+        print "file(%s) does not exist" % plan_file
+        return []
+
+    package_list = []
+    try:
+        dom = xml.dom.minidom.parse(plan_file)
+        test_plan = dom.getElementsByTagName("TestPlan")[0]
+        for entry in test_plan.getElementsByTagName("Entry"):
+            package_list.append(entry.attributes.get('uri').value)
+    except Exception as e:
+        print "Has exception to parse the xml file"
+        print "Exception: %s" % e
+    finally:
+        return package_list
+
+
 def main():
     run_wrapper_path = os.path.join(curdir, 'cts_run_wrapper.sh')
     run_wrapper_cmd = "bash %s" % run_wrapper_path
@@ -156,9 +192,13 @@
     logs = collect_logs()
     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:
-        run_cts_with_plan(run_wrapper_cmd)
-        run_cts_continue(run_wrapper_cmd)
+        for pkg in pkg_list:
+            if not run_cts_with_package(cts_cmd=run_wrapper_cmd, package=pkg):
+                run_cts_continue(run_wrapper_cmd)
     finally:
         for log in logs:
             pid = log.get('pid')