From b9d7e23639fdcb1cb89cd37ef74b225df20e5d57 Mon Sep 17 00:00:00 2001 From: liyanlin02 Date: Fri, 1 Mar 2024 15:15:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B1=8F=E5=B9=95=E5=B8=B8?= =?UTF-8?q?=E4=BA=AE=E6=94=B9=E4=B8=BA=E4=BC=91=E7=9C=A0=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA10=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liyanlin02 --- .../xdevice_smoke/testcases/Launcher.py | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py b/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py index 23765371..2d99277b 100644 --- a/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py +++ b/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py @@ -4,6 +4,7 @@ import re import sys from devicetest.api import Asserts +from devicetest.aw.OpenHarmony import DeviceInfoHelper from devicetest.log.logger import print_info from test_case import ITestCase @@ -21,11 +22,6 @@ class Launcher(ITestCase): def process(self): for retry in range(3): try: - self.step('步骤0.{}：检查屏幕是否点亮'.format(retry)) - try: - self.common_oh.getScreenStatus(self.Phone1) - except: - self.common_oh.pressPowerKey(self.Phone1) self.step('步骤1.{}：点亮屏幕'.format(retry)) self.common_oh.wake(self.Phone1) self.step('步骤2.{}：回到桌面'.format(retry)) @@ -34,19 +30,20 @@ class Launcher(ITestCase): self.step('步骤3.{}：创建临时目录'.format(retry)) self.common_oh.shell(self.Phone1, 'mkdir -p /data/local/tmp/screen_test/train_set') # 屏幕常亮 - self.step('步骤4：设置屏幕常亮') - self.common_oh.shell(self.Phone1, 'power-shell setmode 602') - # 检查屏幕点亮状态 - power_state = self.common_oh.shell(self.Phone1, 'hidumper -s 3308') - # self.common_oh.wait(self.Phone1, 2) - self.step('步骤5：检查屏幕状态') - self.asserts.assert_in('State=2', power_state) + self.step('步骤4{}：设置屏幕常亮'.format(retry)) + DeviceInfoHelper.setSleep(self.Phone1, time_sleep=600) + # self.common_oh.shell(self.Phone1, 'power-shell setmode 602') + # # 检查屏幕点亮状态 + # power_state = self.common_oh.shell(self.Phone1, 'hidumper -s 3308') + # # self.common_oh.wait(self.Phone1, 2) + # self.step('步骤5：检查屏幕状态') + # self.asserts.assert_in('State=2', power_state) # 控件检查 - self.step('步骤6.{}：检查是否在桌面'.format(retry)) + self.step('步骤5.{}：检查是否在桌面'.format(retry)) self.common_oh.checkIfTextExist(self.Phone1, '相机') self.common_oh.checkIfTextExist(self.Phone1, '音乐') # 截图对比 - self.step('步骤7.{}：截图对比'.format(retry)) + self.step('步骤6.{}：截图对比'.format(retry)) launcher_pic = 'launcher.jpeg' self.take_picture_to_local(launcher_pic) similarity = self.compare_image_similarity(launcher_pic) @@ -55,16 +52,16 @@ class Launcher(ITestCase): break except: if retry < 2: - self.step('步骤8.{}：启动失败，重启设备，重试'.format(retry)) + self.step('步骤7.{}：启动失败，重启设备，重试'.format(retry)) self.common_oh.shell(self.Phone1, 'rm -rf /data/*') self.common_oh.safeReboot(self.Phone1) - for i in range(5): - try: - print_info('检查屏幕是否已点亮') - self.common_oh.getScreenStatus(self.Phone1) - break - except: - self.common_oh.wait(self.Phone1, 14) + # for i in range(5): + # try: + # print_info('检查屏幕是否已点亮') + # self.common_oh.getScreenStatus(self.Phone1) + # break + # except: + # self.common_oh.wait(self.Phone1, 14) else: self.step('步骤8.{}：重试了3次，启动失败，收集crash'.format(retry)) self.common_oh.shell(self.Phone1, 'cd /data/log/faultlog/temp && tar -cf after_test_cppcrash{}.tar cppcrash*'.format(self.device_name))