!79 缩减冒烟时间

Merge pull request !79 from lnlan/master_28

screenshot/resource/app_capture_screen_test_config.json

 [
     {
-        "DEVICE_1":[1, 2, 3, 4, 5, 8],
-        "DEVICE_2":[6, 7, 9, 10, 11],
+        "DEVICE_1":[1, 2, 3, 4, 8],
+        "DEVICE_2":[5, 6, 7, 9],
         "return-x-y":[210, 1240],
         "recent-x-y":[515, 1240],
         "home-x-y":[360, 1240],
-        "recent_del-x-y":[360, 1080],
+        "recent_del-x-y":[360, 1170],
         "permisson_ok-x-y":[575, 700],
         "permisson_no-x-y":[140, 700],
         "shot_cmd":[""],
@@ -15,20 +15,13 @@
         "get_file_from_dev":[""],
         "send_file_to_dev":["", ""]
     },
-    {
-        "app_name": "launcher",
-        "entry": "",
-        "all_actions": [
-            [2, "shot_cmd"], [2, "cmp_cmd-level"]
-        ]
-    },
     {
         "app_name": "crash_check",
         "entry": "",
         "compress_file_recv":["cd /data/log/faultlog/temp && tar -cf crash_log.tar cppcrash*"],
         "crash_check":["ls /data/log/faultlog/temp/ -al | wc -l", ""],
         "all_actions": [
-            [2, "remount"], [2, "crash_check"], [2, "compress_file_recv"], [2, "get_file_from_dev", "/data/log/faultlog/temp/crash_log.tar"]
+            [1, "remount"], [1, "crash_check"], [1, "compress_file_recv"], [1, "get_file_from_dev", "/data/log/faultlog/temp/crash_log.tar"]
         ]
     },
     {
@@ -39,7 +32,7 @@
         "compress_log":["cd /data/log/hilog && tar -cf notification_bar.tar *"],
         "all_actions": [
             [2, "pull_down_cmd"], [2, "pull_down_cmd"], [2, "pull_down_cmd"], [2, "pull_down_cmd"],
-            [2, "shot_cmd"], [2, "cmp_cmd-level"], [1, "swipe_up_cmd"], [1, "swipe_up_cmd"], [2, "stop_hilog"], [2, "compress_log"], [2, "get_file_from_dev", "/data/log/hilog/notification_bar.tar"]
+            [2, "shot_cmd"], [2, "cmp_cmd-level"], [1, "swipe_up_cmd"], [1, "swipe_up_cmd"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/notification_bar.tar"]
         ]
     },
     {
@@ -47,7 +40,7 @@
         "entry": "",
         "check_ping_baidu":["ping www.baidu.com", "64 bytes from"],
         "compress_log":["cd /data/log/hilog && tar -cf wifi_connect_log.tar *"],
-        "all_actions": [[2, "connect_wifi"], [2, "check_ping_baidu"], [2, "stop_hilog"], [2, "compress_log"], [2, "get_file_from_dev", "/data/log/hilog/wifi_connect_log.tar"]]
+        "all_actions": [[2, "connect_wifi"], [1, "check_ping_baidu"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/wifi_connect_log.tar"]]
     },
     {
         "app_name": "video_test",
@@ -57,14 +50,14 @@
         "start_video_log":["hilog -r;hilog -w start -l 400000000 -m none;hilog -G 512M"],
         "start_test":["aa start -a ohos.acts.multimedia.video.videoplayer.MainAbility -b ohos.acts.multimedia.video.videoplayer"],
         "recover_log":["cd data/log/hilog/;hilog -x > video_log.txt"],
-        "check_result":["cd /data/log/hilog && grep -nr 'total cases'", ""],
+        "check_result":["cd /data/log/hilog && grep -nr 'total cases'", "failure 0,error 0,pass 1"],
         "compress_log":["cd /data/log/hilog && tar -cf video_log.tar video_*"],
         "clear_log":["rm /data/log/hilog/*"],
         "all_actions": [
-          [2, "install_hap", "vediotest/ActsVideoPlayerJsTest.hap"], [2, "mk_test_dir"], [2, "remount"], 
-          [2, "send_file_to_dev", "vediotest/H264_AAC.mp4", "/data/app/el1/bundle/public/ohos.acts.multimedia.video.videoplayer/ohos.acts.multimedia.video.videoplayer/assets/entry/resources/rawfile/"],
-          [15, "start_test"], [2, "stop_hilog"], [2, "check_result"], [2, "compress_log"],
-          [2, "get_file_from_dev", "/data/log/hilog/video_log.tar"], [2, "clear_log"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"]
+          [2, "install_hap", "vediotest/ActsVideoPlayerJsTest.hap"], [1, "mk_test_dir"], [1, "remount"], 
+          [1, "send_file_to_dev", "vediotest/H264_AAC.mp4", "/data/app/el1/bundle/public/ohos.acts.multimedia.video.videoplayer/ohos.acts.multimedia.video.videoplayer/assets/entry/resources/rawfile/"],
+          [15, "start_test"], [1, "stop_hilog"], [1, "check_result"], [1, "compress_log"],
+          [1, "get_file_from_dev", "/data/log/hilog/video_log.tar"], [1, "clear_log"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"]
         ]
     },
     {
@@ -72,51 +65,44 @@
         "entry": "",
         "remount":["mount -o rw,remount /"],
         "chmodfile1":["chmod 777 /data/audio_renderer_unit_test"],
-        "audio_render_test":["cd /data && ./audio_renderer_unit_test && rm *.xml", ""],
+        "audio_render_test":["cd /data && ./audio_renderer_unit_test && rm *.xml", "[  PASSED  ] 1 test"],
         "compress_log":["cd /data/log/hilog && tar -cf audio_render_log.tar *"],
         "all_actions": [
-            [2, "remount"], [2, "send_file_to_dev", "audiotest/audio_renderer_unit_test", "/data/"], [2, "send_file_to_dev", "audiotest/test_44100_2.wav", "/data/"], [2, "chmodfile1"],
-            [5, "audio_render_test"], [2, "stop_hilog"], [2, "compress_log"], [2, "get_file_from_dev", "/data/log/hilog/audio_render_log.tar"]
+            [1, "remount"], [1, "send_file_to_dev", "audiotest/audio_renderer_unit_test", "/data/"], [1, "send_file_to_dev", "audiotest/test_44100_2.wav", "/data/"], [2, "chmodfile1"],
+            [5, "audio_render_test"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/audio_render_log.tar"]
         ]
     },
     {
         "app_name": "camera",
         "entry": "",
-        "check_result":["cd /data/log/hilog && grep -nr PreviewOutputCallback", ""],
+        "check_result":["cd /data/log/hilog && grep -nr PreviewOutputCallback", "OnFrameStarted"],
         "compress_log":["cd /data/log/hilog && tar -cf camera_log.tar *"],
         "close_auto_log":["hilog -w stop;rm /data/log/hilog/*"],
         "open_camera_log":["hilog -b X;hilog -b D -T CAMERA;hilog -r"],
         "start_camera":["aa start -a MainAbility -b com.ohos.camera"],
         "recover_log":["cd data/log/hilog/;hilog -x > camera_log.txt;hilog -b D"],
         "all_actions": [
-            [1, "close_auto_log"], [1, "open_camera_log"], [5, "start_camera"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "recover_log"], [3, "check_result"],
-            [2, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "compress_log"], [2, "get_file_from_dev", "/data/log/hilog/camera_log.tar"]
+            [1, "close_auto_log"], [1, "open_camera_log"], [5, "start_camera"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [1, "recover_log"], [1, "check_result"],
+            [1, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/camera_log.tar"]
         ]
     },
     {
-        "app_name": "settings_keyboard",
+        "app_name": "settings",
         "entry": "aa start -a com.ohos.settings.MainAbility -b com.ohos.settings",
-        "compress_log":["cd /data/log/hilog && tar -cf settings_keyboard_log.tar *"],
+        "compress_log":["cd /data/log/hilog && tar -cf settings_log.tar *"],
         "all_actions": [
-            [2, "shot_cmd", "settings"], [2, "cmp_cmd-level"], [2, 360, 185], [2, 360, 185], [2, 360, 90], [2, 360, 90],
-            [2, "shot_cmd", "keyboard"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "cmp_cmd-level", 200000], [2, "stop_hilog"], [2, "compress_log"], [2, "get_file_from_dev", "/data/log/hilog/settings_keyboard_log.tar"]
+            [2, "shot_cmd", "settings"], [1, "cmp_cmd-level"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/settings_log.tar"]
         ]
     },
     {
         "app_name": "photos",
         "entry": "aa start -a com.ohos.photos.MainAbility -b com.ohos.photos",
-        "all_actions": [[2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "cmp_cmd-level", 200000], [2, "recent-x-y"], [2, "recent_del-x-y"]]
-    },
-    {
-        "app_name": "distributedcalc",
-        "entry": "aa start -a com.example.distributedcalc.default -b com.example.distributedcalc",
-        "compress_log":["cd /data/log/hilog && tar -cf calc_log.tar *"],
-        "all_actions": [[2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "cmp_cmd-level", 200000], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "stop_hilog"], [2, "compress_log"], [2, "get_file_from_dev", "/data/log/hilog/calc_log.tar"]]
+        "all_actions": [[2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "cmp_cmd-level", 200000], [1, "recent-x-y"], [1, "recent_del-x-y"]]
     },
     {
         "app_name": "note",
         "entry": "aa start -a MainAbility -b com.ohos.note",
         "compress_log":["cd /data/log/hilog && tar -cf note_log.tar *"],
-        "all_actions": [[2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "cmp_cmd-level"], [2, "stop_hilog"], [2, "compress_log"], [2, "get_file_from_dev", "/data/log/hilog/note_log.tar"]]
+        "all_actions": [[2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "cmp_cmd-level"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/note_log.tar"]]
     }
 ]

screenshot/resource/capturescreentest.py

@@ -21,8 +21,11 @@ import argparse
 import re
 import subprocess
 import shlex
+import datetime
 
 def PrintToLog(str):
+    time = datetime.datetime.now()
+    str = "[{}] {}".format(time, str)
     print(str)
     with open(os.path.join(args.save_path, 'shot_test_{}.log'.format(args.device_num)), mode='a', encoding='utf-8') as log_file:
         console = sys.stdout
@@ -50,9 +53,6 @@ def EnterCmd(mycmd, waittime = 0, printresult = 1):
         except Exception as e:
             result = 'retry failed again'
             PrintToLog(e)
-            PrintToLog("cmd_retry_trace_{}_{}.png".format(args.device_num, CmdRetryCnt))
-            os.system("hdc_std -t {} shell \" snapshot_display -f /data/cmd_retry_trace_{}_{}.png\"".format(args.device_num, args.device_num, CmdRetryCnt))
-            GetFileFromDev("/data/cmd_retry_trace_{}_{}.png".format(args.device_num, CmdRetryCnt), args.save_path)
             CmdRetryCnt += 1
             p.kill()
     if printresult == 1:
@@ -147,10 +147,10 @@ if __name__ == "__main__":
     rebootcnt = 2
     while rebootcnt:
         rebootcnt -= 1
-        os.system("hdc_std start")
+        #os.system("hdc_std start")
         EnterCmd("hdc_std list targets", 1)
-        EnterCmd("hdc_std list targets", 1)
-        EnterShellCmd("rm -rf /data/screen_test/train_set")
+        #EnterCmd("hdc_std list targets", 1)
+        #EnterShellCmd("rm -rf /data/screen_test/train_set")
         EnterShellCmd("mkdir -p /data/screen_test/train_set")
         SendFileToDev(os.path.normpath(os.path.join(args.tools_path, "resource/printscreen")), "/data/screen_test/")
         EnterShellCmd("chmod 777 /data/screen_test/printscreen")
@@ -164,12 +164,14 @@ if __name__ == "__main__":
         GetFileFromDev("/data/log/hilog/system_start_log_{}.tar".format(args.device_num), args.save_path)
         #print(os.path.normpath(os.path.join(args.anwser_path, "launcher.pngraw")))
         SendFileToDev(os.path.normpath(os.path.join(args.anwser_path, "launcher.pngraw")), "/data/screen_test/train_set")
-        EnterShellCmd("/data/screen_test/printscreen -f /data/screen_test/rmlock.png", 1)
-        cmp_launcher = "cmp -l /data/screen_test/rmlock.pngraw /data/screen_test/train_set/launcher.pngraw | wc -l"
+        EnterShellCmd("/data/screen_test/printscreen -f /data/screen_test/launcher_{}.png".format(args.device_num), 1)
+        GetFileFromDev("/data/screen_test/launcher_{}.pngraw".format(args.device_num), args.save_path)
+        GetFileFromDev("/data/screen_test/launcher_{}.png".format(args.device_num), args.save_path)
+        cmp_launcher = "cmp -l /data/screen_test/launcher.pngraw /data/screen_test/train_set/launcher.pngraw | wc -l"
         p = EnterShellCmd(cmp_launcher, 1)
         num = re.findall(r'[-+]?\d+', p)
         PrintToLog(num)
-        if type(num) == list and len(num) > 0 and int(num[0]) < 1000000:
+        if type(num) == list and len(num) > 0 and int(num[0]) < 443200:
             PrintToLog("remove lock is ok!\n\n")
             break
         elif rebootcnt >= 1:
@@ -188,7 +190,8 @@ if __name__ == "__main__":
         text = f.read()
         two_check_process_list = text.split('#####')[1].split()[0:-1]
         other_process_list = text.split('#####')[2].split()
-        for pname in two_check_process_list + other_process_list:
+        #for pname in two_check_process_list + other_process_list:
+        for pname in two_check_process_list:
             pids = EnterCmd("hdc_std -t {} shell pidof {}".format(args.device_num, pname), 0, 1)
             try:
                 pidlist = pids.split()
@@ -198,6 +201,12 @@ if __name__ == "__main__":
                 process_pid[pname] = pidlist
             except:
                 lose_process.append(pname)
+        all_p = EnterShellCmd("ps -elf")
+        for pname in other_process_list:
+            findp = all_p.find(pname, 0, len(all_p))
+            if findp == -1:
+                lose_process.append(pname)
+
     if lose_process:
         PrintToLog("\n\nERROR: %s, These processes are not exist!!!\n" % lose_process)
         PrintToLog("SmokeTest find some fatal problems!")
@@ -366,7 +375,8 @@ if __name__ == "__main__":
     #key processes second check, and cmp to first check
     PrintToLog("\n\n########## Second check key processes start ##############")
     second_check_lose_process = []
-    for pname in two_check_process_list + other_process_list:
+    #for pname in two_check_process_list + other_process_list:
+    for pname in two_check_process_list:
         pids = EnterCmd("hdc_std -t {} shell pidof {}".format(args.device_num, pname), 0, 1)
         try:
             pidlist = pids.split()