From 506833fc736da49b73ec2d7d42b66937b5424f4b Mon Sep 17 00:00:00 2001 From: chengjian-com <2969201889@qq.com> Date: Fri, 24 Nov 2023 06:53:00 +0000 Subject: [PATCH] =?UTF-8?q?update=20DeployDevice/src/func/liteOsUpgrade/li?= =?UTF-8?q?teOsUpgrade=5FRK3568=5Fapp.py.=20=E6=B7=BB=E5=8A=A0=E5=86=92?= =?UTF-8?q?=E7=83=9F=E8=84=9A=E6=9C=AC=E8=B0=83=E7=94=A8=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E4=B8=8E=E7=BB=93=E6=9D=9F=E7=9A=84=E6=89=93=E5=8D=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=86=92=E7=83=9F=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 ecd3e96..e77e3a6 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -437,7 +437,7 @@ def start_cmd(sn): return False -@timeout(3600) +@timeout(1200) def cmd_test(screenshot_path, py_path, new_report_path, resource_path, sn, test_num, pr_url): save_screenshot_path = os.path.join(new_report_path, "screenshot_result") logger.info(save_screenshot_path) @@ -468,8 +468,9 @@ def cmd_test(screenshot_path, py_path, new_report_path, resource_path, sn, test_ return False -@timeout(3600) +@timeout(1000) def outCmd(cmd, save_screenshot_path, base_screenshot_path, resource_path): + logger.info("SMOKE_TEST_START") logger.info("cmd is: %s" % cmd) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, encoding="gbk") curline = p.stdout.readline() @@ -500,6 +501,7 @@ def outCmd(cmd, save_screenshot_path, base_screenshot_path, resource_path): logger.info(t) p.wait() logger.info("p.returncode %s" % p.returncode) + logger.info("SMOKE_TEST_END") if p.returncode == 0: logger.info("screenshot check is ok!") return True @@ -512,6 +514,7 @@ def outCmd(cmd, save_screenshot_path, base_screenshot_path, resource_path): @timeout(1000) def exec_cmd(mini_path, sn, save_path, archive_path): +logger.info("SMOKE_TEST_START") cmd = "python %s --device_num %s --save_path %s --archive_path %s" % (mini_path, sn, save_path, archive_path) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, encoding="gbk") curline = p.stdout.readline() @@ -523,6 +526,7 @@ def exec_cmd(mini_path, sn, save_path, archive_path): logger.error(e) p.wait() logger.info("p.returncode %s" % p.returncode) + logger.info("SMOKE_TEST_END") if p.returncode == 0: logger.info("mini_system_test is ok!") return True -- Gitee