Merge lp:~liuyq0307/lava-android-test/cts-continue-session into lp:lava-android-test

[Yongqin Liu]

In the cts test, there are such case that the adb connection is lost during the execution, but we can connect again if try to connect after disconnect.

1. add support for continuing the uncompleted cts test
2. fix the problem of adb.reconnect method to not check the result of disconnect

[lp:~liuyq0307/lava-android-test/cts-continue-session]

260. By Yongqin Liu on 2013-07-03

add some sleep time

Unmerged revisions

260. By Yongqin Liu on 2013-07-03

add some sleep time

259. By Yongqin Liu on 2013-07-01

1. add support for continuing the uncompleted cts test
2. fix the problem of adb.reconnect method to not check the result of disconnect

=== modified file 'lava_android_test/adb.py'
--- lava_android_test/adb.py	2013-06-03 05:39:36 +0000
+++ lava_android_test/adb.py	2013-07-03 03:44:24 +0000
@@ -306,6 +306,7 @@
     def connect(self):
         if self.serial:
             self.run_cmd_host('adb connect %s' % self.serial, quiet=False)
+            time.sleep(3)
             return self.isDeviceConnected()
         return False
 
@@ -319,10 +320,10 @@
         for i in range(1, 5):
             print "LAVA: try to reconnect the device(%s) %i/5 times" % (
                                                                self.serial, i)
-            if self.disconnect():
-                time.sleep(2)
-                if self.connect():
-                    return True
+            self.disconnect()
+            time.sleep(3)
+            if self.connect():
+                return True
             time.sleep(5)
         return False
 

=== modified file 'lava_android_test/test_definitions/cts/cts_wrapper.py'
--- lava_android_test/test_definitions/cts/cts_wrapper.py	2013-06-09 07:15:03 +0000
+++ lava_android_test/test_definitions/cts/cts_wrapper.py	2013-07-03 03:44:24 +0000
@@ -53,27 +53,8 @@
         result = False
     finally:
         proc_cts.sendcontrol('C')
+        proc_cts.sendcontrol('C')
         proc_cts.sendline('')
-        target_dir = os.path.join(os.getcwd(),
-                                  './android-cts/repository/results/')
-        for zip_f in find_files(target_dir, '.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())
-        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
 
 
@@ -81,21 +62,21 @@
     list_result_path = os.path.join(curdir, 'cts_list_result_wrapper.sh')
     list_result_cmd = "bash %s" % list_result_path
 
-    pattern = 'CTS          unknown'
+    pattern = 'I/CommandScheduler: All done'
     if not stop_at_pattern(command=list_result_cmd,
-                            pattern=pattern, timeout=5):
+                            pattern=pattern, timeout=30):
         print "Failed to list the cts result for device(%s)" % adb.get_serial()
 
     with open('cts_list_results.log') as fd:
         #0        17237  126   0     2012.06.23_03.31.49  CTS        unknown
-        pattern = ("\s*\d+\s+\d+\s+\d+\s+(?P<no_executed>\d+)"
-                   "\s+.+CTS\s+unknown\s*$")
+        pattern = ("^\s*0\s+\d+\s+\d+\s+(?P<not_executed>\d+)\s+[\d._]+"
+                   "\s+\S+\s+unknown\s*$")
         pat = re.compile(pattern)
         for line in fd.readlines():
             match = pat.search(line)
             if not match:
                 continue
-            return match.groupdict()['no_executed']
+            return match.groupdict()['not_executed']
         return 0
 
 
@@ -157,9 +138,9 @@
     return True
 
 
-def run_cts_continue(cts_cmd=None):
+def run_cts_continue(cts_cmd=None, timeout=36000):
     pattern = "Time:"
-    continue_command = '--continue-session 0'
+    continue_command = 'run cts --continue-session 0'
     if cts_cmd:
         continue_command = "%s %s" % (cts_cmd, continue_command)
 
@@ -178,7 +159,7 @@
 
             if not stop_at_cts_pattern(command=continue_command,
                                    pattern=pattern,
-                                   timeout=36000):
+                                   timeout=timeout):
                 print "CTS test times out"
         else:
             break
@@ -229,10 +210,10 @@
                                                            adb.get_serial())
                 with open(log_file) as log_fd:
                     print '=========Log file [%s] starts=========>>>>>' % (
-                                                                       log_file)
+                                                                      log_file)
                     for line in log_fd.readlines():
                         print line.rstrip()
-                    print '<<<<<=========Log file [%s] ends=========' % log_file
+                    print '<<<<<=========Log file [%s] ends========' % log_file
 
 
 def get_all_packages(plan_file=None):
@@ -316,7 +297,29 @@
             run_cts_with_plan(cts_cmd=run_wrapper_cmd, plan=plan_name,
                               timeout=timeout)
 
+        time.sleep(3)
+        run_cts_continue(cts_cmd=run_wrapper_path, timeout=timeout)
     finally:
+        target_dir = os.path.join(os.getcwd(),
+                                  './android-cts/repository/results/')
+        for zip_f in find_files(target_dir, '.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())
+        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())
         for log in logs:
             pid = log.get('pid')
             if pid: