Merge lp:~liuyq0307/lava-android-test/check-before-copy into lp:lava-android-test

[Yongqin Liu]

Some improvement for CTS test:
1. add check after push in the cts_wrapper.py and add check before copy in the copy function of adb.copy
2. change to store the kmsg.log and logcat.log as attachments instead of output in the log

[Yongqin Liu (liuyq0307)]

review: Approve (self test)

=== modified file 'lava_android_test/adb.py'
--- lava_android_test/adb.py	2012-07-02 01:52:32 +0000
+++ lava_android_test/adb.py	2013-06-03 08:38:28 +0000
@@ -198,6 +198,9 @@
             return 0
         if target_file is None:
             return 0
+        if not self.exists(source_file):
+            return 0
+
         ret_code = self.shell("dd if=%s of=%s" % (source_file, target_file))
         return ret_code
 
 
=== modified file 'lava_android_test/test_definitions/cts.py'
--- lava_android_test/test_definitions/cts.py	2013-05-18 06:29:22 +0000
+++ lava_android_test/test_definitions/cts.py	2013-06-03 08:38:28 +0000
@@ -27,30 +27,39 @@
 """
 
 import os
-import lava_android_test.testdef
+
+from lava_android_test.testdef import (Attachment,
+                                       AndroidTest,
+                                       AndroidTestInstaller,
+                                       AndroidTestRunner,
+                                       AndroidTestParser)
 
 test_name = 'cts'
 
 curdir = os.path.realpath(os.path.dirname(__file__))
 
-RUN_STEPS_HOST_PRE = ['python %s/cts/cts_wrapper.py $(SERIAL) $(OPTIONS)' % 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(
-                                steps_host_pre=RUN_STEPS_HOST_PRE)
+inst = AndroidTestInstaller()
+run = AndroidTestRunner(steps_host_pre=RUN_STEPS_HOST_PRE)
 
 #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+)"
            "\s+(?P<result>\S+)\s*$")
-parser = lava_android_test.testdef.AndroidTestParser(pattern=pattern,
-                            fixupdict={'PASS': 'pass', 'FAIL': 'fail'})
+parser = AndroidTestParser(pattern=pattern,
+                           fixupdict={'PASS': 'pass', 'FAIL': 'fail'})
 
-attachments = [lava_android_test.testdef.Attachment(
-                            pathname="/data/local/tmp/cts-results.zip",
-                            mime_type="application/zip")
+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",
+               mime_type="application/zip")
                 ]
-testobj = lava_android_test.testdef.AndroidTest(testname=test_name,
+testobj = AndroidTest(testname=test_name,
                                                 installer=inst,
                                                 runner=run,
                                                 parser=parser,
 
=== modified file 'lava_android_test/test_definitions/cts/cts_wrapper.py'
--- lava_android_test/test_definitions/cts/cts_wrapper.py	2013-05-18 06:29:22 +0000
+++ lava_android_test/test_definitions/cts/cts_wrapper.py	2013-06-03 08:38:28 +0000
@@ -57,8 +57,10 @@
         target_dir = os.path.join(os.getcwd(),
                                   './android-cts/repository/results/')
         for zip_f in find_files(target_dir, '.zip'):
-            adb.push(zip_f, '/data/local/tmp/cts-results.zip')
-
+            ret_code = adb.push(zip_f, '/data/local/tmp/cts-results.zip')[0]
+            if ret_code != 0:
+                print "Failed to push file %s to device(%s)" % (zip_f,
+                                                           adb.get_serial())
     return result
 
 
@@ -203,15 +205,21 @@
     return logs
 
 
-def print_log(logs=[]):
+def push_log(logs=[]):
     for log in logs:
         log_file = log.get('output_file')
+        base_name = os.path.basename(log_file)
         if log_file:
-            with open(log_file) as log_fd:
-                print '=========Log file [%s] starts=========>>>>>' % log_file
-                for line in log_fd.readlines():
-                    print line.rstrip()
-                print '<<<<<=========Log file [%s] ends=========' % log_file
+            ret_code = adb.push(log_file, '/data/local/tmp/%s' % base_name)[0]
+            if ret_code != 0:
+                print "Failed to push file %s to device(%s)" % (log_file,
+                                                           adb.get_serial())
+                with open(log_file) as log_fd:
+                    print '=========Log file [%s] starts=========>>>>>' % (
+                                                                       log_file)
+                    for line in log_fd.readlines():
+                        print line.rstrip()
+                    print '<<<<<=========Log file [%s] ends=========' % log_file
 
 
 def get_all_packages(plan_file=None):
@@ -301,7 +309,7 @@
             if pid:
                 adb.run_cmd_host('kill -9 %s' % pid)
 
-        print_log(logs)
+        push_log(logs)
 
     sys.exit(0)