From b410123ac0ad72c2343c17948806d2e7d6e7b637 Mon Sep 17 00:00:00 2001 From: chengjian-com <2969201889@qq.com> Date: Mon, 4 Dec 2023 08:37:41 +0000 Subject: [PATCH 1/4] update DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py. Signed-off-by: chengjian-com <2969201889@qq.com> --- .../src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index 3afe47b..c29ef7a 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -8,7 +8,6 @@ import re import shutil import random - from core.base import BaseApp, dec_stepmsg from util.file_locker import FileLock from util.log_info import logger @@ -18,13 +17,14 @@ from aw.Common.Constant import CONSTANT from aw.Common.Common import getFileName from aw.ExtractFile.ExtractFile import * from aw.Common.Common import getHostIp, copyFile, copyDirectory - +total_time = "" lock_suffix = CONSTANT.File.LOCK_SUFFIX suc_file = CONSTANT.File.SUC_FILE failed_file = CONSTANT.File.FAILED_FILE REBOOT_TIMEOUT = 20000000 + class liteOsUpgrade_RK3568(BaseApp): ''' @author: cwx1076044 @@ -457,7 +457,11 @@ def cmd_test(screenshot_path, py_path, new_report_path, resource_path, sn, test_ config_path = os.path.join(screenshot_path, "resource", "app_capture_screen_test_config.json") py_cmd = "python %s --config %s --anwser_path %s --save_path %s --device_num %s --test_num %s --tools_path %s --pr_url %s" \ % (py_path, config_path, resource_path, save_screenshot_path, sn, test_num, screenshot_path, pr_url) + time1 = time.time() result = outCmd(py_cmd, save_screenshot_path, base_screenshot_path, resource_path) + time2 = time.time() + total_time = int(time2 - time1) + logger.info("total_time: %s" % total_time) if result == 1: return True if result == 98: -- Gitee From 727ef0df59697d89151f6991bb885de59e4b00cb Mon Sep 17 00:00:00 2001 From: chengjian-com <2969201889@qq.com> Date: Mon, 4 Dec 2023 09:04:15 +0000 Subject: [PATCH 2/4] update DeployDevice/src/controller.py. Signed-off-by: chengjian-com <2969201889@qq.com> --- DeployDevice/src/controller.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DeployDevice/src/controller.py b/DeployDevice/src/controller.py index e55e647..e48a485 100644 --- a/DeployDevice/src/controller.py +++ b/DeployDevice/src/controller.py @@ -15,6 +15,7 @@ import argparse from core.run import * from aw.Common.Constant import CONSTANT from util.log_info import logger +from func.liteOsUpgrade.liteOsUpgrade_RK3568_app import total_time if __name__ == "__main__": @@ -27,5 +28,10 @@ if __name__ == "__main__": if errcode != 0: logger.printLog("执行失败：错误信息：" + CONSTANT.ENVERRMESSAGE) logger.printLog("UPGRADE_STATUS_%s" % errcode) + try: + with open(param_file, "a+") as f: + f.write("\nstatus=UPGRADE_STATUS_%s\nsmoke_duration=%s" % (errcode, total_time)) + except Exception as p: + logger.error(p) os._exit(errcode) -- Gitee From f27b2d6ef15a8c85d662789466e299f7603ea3e2 Mon Sep 17 00:00:00 2001 From: chengjian-com <2969201889@qq.com> Date: Mon, 11 Dec 2023 07:45:06 +0000 Subject: [PATCH 3/4] update DeployDevice/src/controller.py. Signed-off-by: chengjian-com <2969201889@qq.com> --- DeployDevice/src/controller.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DeployDevice/src/controller.py b/DeployDevice/src/controller.py index e48a485..6b87157 100644 --- a/DeployDevice/src/controller.py +++ b/DeployDevice/src/controller.py @@ -15,7 +15,7 @@ import argparse from core.run import * from aw.Common.Constant import CONSTANT from util.log_info import logger -from func.liteOsUpgrade.liteOsUpgrade_RK3568_app import total_time + if __name__ == "__main__": @@ -28,6 +28,7 @@ if __name__ == "__main__": if errcode != 0: logger.printLog("执行失败：错误信息：" + CONSTANT.ENVERRMESSAGE) logger.printLog("UPGRADE_STATUS_%s" % errcode) + from func.liteOsUpgrade.liteOsUpgrade_RK3568_app import total_time try: with open(param_file, "a+") as f: f.write("\nstatus=UPGRADE_STATUS_%s\nsmoke_duration=%s" % (errcode, total_time)) -- Gitee From 529e38f0388312ff63d85829cf55ebfb9bd955f1 Mon Sep 17 00:00:00 2001 From: chengjian-com <2969201889@qq.com> Date: Mon, 11 Dec 2023 07:48:24 +0000 Subject: [PATCH 4/4] update DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py. Signed-off-by: chengjian-com <2969201889@qq.com> --- DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index c29ef7a..e9ecdb9 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -439,6 +439,7 @@ def start_cmd(sn): @timeout(900) def cmd_test(screenshot_path, py_path, new_report_path, resource_path, sn, test_num, pr_url): + global total_time save_screenshot_path = os.path.join(new_report_path, "screenshot_result") logger.info(save_screenshot_path) time_sleep = random.randint(1, 5) -- Gitee