diff --git a/screenshot32/resource/app_capture_screen_test_config.json b/screenshot32/resource/app_capture_screen_test_config.json index 7e2831ae1eb2066fc6ac686a62e0c4c2e76c57a4..bfdf8b4117069c1a4f02f0d65c1c733bce6795fa 100644 --- a/screenshot32/resource/app_capture_screen_test_config.json +++ b/screenshot32/resource/app_capture_screen_test_config.json @@ -92,10 +92,11 @@ "entry": "", "start_screenshot": ["aa start -a com.ohos.screenshot.ServiceExtAbility -b com.ohos.screenshot"], "start_photos": ["aa start -a com.ohos.photos.MainAbility -b com.ohos.photos"], - "cp_db": ["cp /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/rdb/media_library.db /data/photo.db"], "kill_photos": ["killall com.ohos.photos"], "all_actions": [ - [8, "start_screenshot"], [5, "start_photos"], [2, "last_photos-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], [1, "cp_db"], [1, "get_file_from_dev", "/data/photo.db"], + [8, "start_screenshot"], [5, "start_photos"], [2, "last_photos-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], + [1, "get_file_from_dev", "/data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/rdb/media_library.db"], + [1, "get_file_from_dev", "/data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/rdb/media_library.db-wal"], [2, "photo_check"], [1, "process_check", "com.ohos.medialibrary.medialibrarydata"], [2, "sandbox_path_check"], [1, "kill_photos"] ] }, diff --git a/screenshot32/resource/capturescreentest.py b/screenshot32/resource/capturescreentest.py index 85a7f6c63d54fdcda6cd6e974108d0507595e5fe..e5427c22851a0ab72302b2f9352c040e708c25ae 100644 --- a/screenshot32/resource/capturescreentest.py +++ b/screenshot32/resource/capturescreentest.py @@ -475,7 +475,7 @@ if __name__ == "__main__": testok = -1 elif type(single_action[1]) == str and single_action[1] == 'photo_check': next_cmd = "" - if ImageCheck("{}\\photo.db".format(os.path.normpath(args.save_path)), 1) == 1 and testok == 1: + if ImageCheck("{}\\media_library.db".format(os.path.normpath(args.save_path)), 1) == 1 and testok == 1: testok = 1 else: testok = -1 @@ -565,13 +565,11 @@ if __name__ == "__main__": if process_pid[pname] != pidlist: if pname in two_check_process_list: PrintToLog("SmokeTest:: error: pid of %s is different the first check" % pname) - SysExit() else: PrintToLog("SmokeTest:: warnning: pid of %s is different the first check" % pname) elif len(pidlist) != 1: if pname in two_check_process_list: PrintToLog("SmokeTest:: error: pid of %s is not only one" % pname) - SysExit() else: PrintToLog("SmokeTest:: warnning: pid of %s is not only one" % pname) except: @@ -579,7 +577,6 @@ if __name__ == "__main__": if second_check_lose_process: PrintToLog("SmokeTest:: error: pid of %s is not exist" % pname) - SysExit() else: PrintToLog("SmokeTest:: second processes check is ok")