From 0627016d044b7599a50dfd84acfaec270d96a59f Mon Sep 17 00:00:00 2001 From: redjie Date: Fri, 17 Jun 2022 09:12:34 +0800 Subject: [PATCH] delete cppcrash check Signed-off-by: redjie Change-Id: I9c9477940aa01cb5e85ac734b533a6a601f2cf80 --- .../resource/app_capture_screen_test_config.json | 4 ++-- screenshot/resource/capturescreentest.py | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/screenshot/resource/app_capture_screen_test_config.json b/screenshot/resource/app_capture_screen_test_config.json index 185d5b1..1e9a86a 100644 --- a/screenshot/resource/app_capture_screen_test_config.json +++ b/screenshot/resource/app_capture_screen_test_config.json @@ -101,8 +101,8 @@ "entry": "aa start -a com.ohos.photos.MainAbility -b com.ohos.photos", "compress_log":["cd /data/log/hilog && tar -cf photos_log.tar *"], "all_actions": [ - [2, "shot_cmd", "photo_check_1"], [2, "permisson_ok-x-y"], [2, "shot_cmd", "photo_check_2"], [2, "permisson_ok-x-y"], [2, "shot_cmd", "photo_check_3"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [2, "recent-x-y"], [2, "shot_cmd", "photo_check_4"], [2, "recent_del-x-y"], - [2, "shot_cmd", "photo_check_5"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/photos_log.tar"] + [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"], + [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/photos_log.tar"] ] }, { diff --git a/screenshot/resource/capturescreentest.py b/screenshot/resource/capturescreentest.py index fe30b18..cd29ca1 100644 --- a/screenshot/resource/capturescreentest.py +++ b/screenshot/resource/capturescreentest.py @@ -431,14 +431,8 @@ if __name__ == "__main__": EnterShellCmd("cd /data/log/faultlog/temp && tar -cf after_test_crash_log_{}.tar cppcrash*".format(args.device_num)) GetFileFromDev("/data/log/faultlog/temp/after_test_crash_log_{}.tar".format(args.device_num), os.path.normpath(args.save_path)) - crash_cnt = EnterShellCmd("cd /data/log/faultlog/temp && find . -name cppcrash*", 2) - result = "".join(crash_cnt) - findsome = result.find("cppcrash", 0, len(result)) - if findsome != -1: - PrintToLog("ERROR:find cppcrash !\n") - PrintToLog("SmokeTest find some fatal problems!") - PrintToLog("End of check, test failed!") - SysExit() + EnterShellCmd("cd /data/log/faultlog/temp && find . -name cppcrash*", 2) + EnterShellCmd("cd /data/log/faultlog/temp && grep \"Process name\" -rnw ./", 2) if len(fail_idx_list) != 0: PrintToLog("ERROR: name {}, index {}, these testcase is failed".format(fail_name_list, fail_idx_list)) if fail_name_list.count('launcher') or fail_name_list.count('settings_keyboard'): -- Gitee