Merge lp:~liuyq0307/lava-android-test/cts-logcat-hostlog into lp:lava-android-test

[Yongqin Liu]

add the host_log and device_logcat log of CTS test into the result as attachment.

[Yongqin Liu (liuyq0307)]

review: Approve (self test)

=== modified file 'lava_android_test/test_definitions/cts.py'
--- lava_android_test/test_definitions/cts.py	2013-06-03 08:35:02 +0000
+++ lava_android_test/test_definitions/cts.py	2013-06-09 07:34:25 +0000
@@ -52,13 +52,17 @@
                            fixupdict={'PASS': 'pass', 'FAIL': 'fail'})
 
 attachments = [
-    Attachment(pathname="/data/local/tmp/logcat.log",
-               mime_type="text/plain"),
-    Attachment(pathname="/data/local/tmp/kmsg.log",
-               mime_type="text/plain"),
-    Attachment(pathname="/data/local/tmp/cts-results.zip",
+        Attachment(pathname="/data/local/tmp/logcat.log",
+               mime_type="text/plain"),
+        Attachment(pathname="/data/local/tmp/kmsg.log",
+               mime_type="text/plain"),
+        Attachment(pathname="/data/local/tmp/cts-results.zip",
+               mime_type="application/zip"),
+        Attachment(pathname="/data/local/tmp/device_logcat.zip",
+               mime_type="application/zip"),
+        Attachment(pathname="/data/local/tmp/host_log.zip",
                mime_type="application/zip")
-                ]
+        ]
 testobj = AndroidTest(testname=test_name,
                                                 installer=inst,
                                                 runner=run,
 
=== modified file 'lava_android_test/test_definitions/cts/cts_wrapper.py'
--- lava_android_test/test_definitions/cts/cts_wrapper.py	2013-06-03 08:35:02 +0000
+++ lava_android_test/test_definitions/cts/cts_wrapper.py	2013-06-09 07:34:25 +0000
@@ -61,6 +61,19 @@
             if ret_code != 0:
                 print "Failed to push file %s to device(%s)" % (zip_f,
                                                            adb.get_serial())
+        log_target_dir = os.path.join(os.getcwd(),
+                                  './android-cts/repository/logs/')
+        for zip_f in find_files(log_target_dir, '.zip'):
+            base_name = os.path.basename(zip_f)
+            if base_name.startswith('device_logcat_'):
+                base_name = 'device_logcat.zip'
+            if base_name.startswith('host_log_'):
+                base_name = 'host_log.zip'
+
+            ret_code = adb.push(zip_f, '/data/local/tmp/%s' % base_name)[0]
+            if ret_code != 0:
+                print "Failed to push file %s to device(%s)" % (zip_f,
+                                                           adb.get_serial())
     return result