diff --git a/screenshot/audiotest/hdf_audio_hdi_server_function_test b/screenshot/audiotest/hdf_audio_hdi_server_function_test index b8163d38eeb59b3d8733f37c4ae8fb6fa4174232..36dc502bee51cb88e9ca73b5927431758b80ba73 100755 Binary files a/screenshot/audiotest/hdf_audio_hdi_server_function_test and b/screenshot/audiotest/hdf_audio_hdi_server_function_test differ diff --git a/screenshot/resource/app_capture_screen_test_config.json b/screenshot/resource/app_capture_screen_test_config.json index 728cd6b5d55ebd9d9c3bb80aa68d9aed2dd649a0..05418c639a8903392aa7834de0e4a58ee86f1563 100644 --- a/screenshot/resource/app_capture_screen_test_config.json +++ b/screenshot/resource/app_capture_screen_test_config.json @@ -59,7 +59,7 @@ "start_test":["hdc_std shell aa start -a ohos.acts.multimedia.video.videoplayer.MainAbility -b ohos.acts.multimedia.video.videoplayer"], "recover_log":["hdc_std shell \"cd data/log/hilog/;hilog -x > vedio_log.txt;hilog -b D"], "stop_hilog":["hdc_std shell hilog -w stop"], - "check_result":["hdc_std shell \"cd /data/log/hilog && grep -nr 'total cases'\"", "failure 0,error 0,pass 1"], + "check_result":["hdc_std shell \"cd /data/log/hilog && grep -nr 'total cases'\"", ""], "compress_log":["hdc_std shell \"cd /data/log/hilog && tar -cf vedio_log.tar vedio_*\""], "clear_log":["hdc_std shell rm /data/log/hilog/*"], "all_actions": [ @@ -73,7 +73,7 @@ "entry": "", "remount":["hdc_std shell mount -o rw,remount /"], "sendfile1":["hdc_std file send D:\\DeviceTestTools\\screenshot\\audiotest\\hdf_audio_hdi_server_function_test /data/"], - "sendfile2":["hdc_std file send D:\\DeviceTestTools\\screenshot\\audiotest\\audiorendertest.wav /bin/"], + "sendfile2":["hdc_std file send D:\\DeviceTestTools\\screenshot\\audiotest\\audiorendertest.wav /data/"], "chmodfile1":["hdc_std shell chmod 777 /data/hdf_audio_hdi_server_function_test"], "executefile1":["hdc_std shell ./data/hdf_audio_hdi_server_function_test"], "audio_render_test":["hdc_std shell \"cd /data && ./hdf_audio_hdi_server_function_test --gtest_filter=AudioServerFunctionTest.SUB_Audio_Function_Render_Test_* && rm *.xml\"", "[ PASSED ] 12 tests."], diff --git a/screenshot/resource/capturescreentest.py b/screenshot/resource/capturescreentest.py index 13db81a3050aebe24d66b2a98a9b61f2ed44a32b..6bf1bf367ffb0e2e4cba77c972555f476fca3e38 100644 --- a/screenshot/resource/capturescreentest.py +++ b/screenshot/resource/capturescreentest.py @@ -172,6 +172,13 @@ if __name__ == "__main__": EnterCmd(capture_screen_cmd.format(pic_name), 1) EnterCmd(recv_file_cmd.format(pic_name, args.save_path), 1) EnterCmd(recv_file_cmd.format(raw_pic_name, args.save_path), 1) + p = EnterCmd("hdc_std shell ls -al /data/screen_test/{}".format(raw_pic_name), 1) + no_such = re.findall(r'No such file or directory', p) + print(no_such) + if type(no_such) == list and len(no_such) > 0 and no_such[0] == 'No such file or directory': + MyPrint("ERROR: {} screenshot failed!\n\n".format(raw_pic_name)) + MyPrint("End of check, test failed!") + sys.exit(255) next_cmd = "" #cmp_cmd-level is stable, different to other cmd,so handle it specialy elif type(single_action[1]) == str and single_action[1] == 'cmp_cmd-level': diff --git a/screenshot/resource/printscreen b/screenshot/resource/printscreen index a787321593fae78d39d5ba6eb70199c91e8b6d78..3890d3bf716670041b021c31917eab7bc08ccf7f 100644 Binary files a/screenshot/resource/printscreen and b/screenshot/resource/printscreen differ