diff --git a/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py b/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py index 40c4e2169d6a939f58a19a0c2b7351895821802d..4760231509813e6c6bf17e7487207ea6808ceb23 100644 --- a/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py +++ b/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py @@ -21,12 +21,17 @@ class Launcher(ITestCase): def process(self): for retry in range(3): try: - self.step('步骤1:点亮屏幕') + 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:回到桌面') + self.step('步骤2.{}:回到桌面'.format(retry)) self.common_oh.goHome(self.Phone1) self.common_oh.wait(self.Phone1, 1) - self.step('步骤3:创建临时目录') + self.step('步骤3.{}:创建临时目录'.format(retry)) self.common_oh.shell(self.Phone1, 'mkdir -p /data/local/tmp/screen_test/train_set') # 屏幕常亮 self.step('步骤4:设置屏幕常亮') @@ -37,11 +42,11 @@ class Launcher(ITestCase): self.step('步骤5:检查屏幕状态') self.asserts.assert_in('State=2', power_state) # 控件检查 - self.step('步骤6:检查是否在桌面') + self.step('步骤6.{}:检查是否在桌面'.format(retry)) self.common_oh.checkIfTextExist(self.Phone1, '相机') self.common_oh.checkIfTextExist(self.Phone1, '音乐') # 截图对比 - self.step('步骤7:截图对比') + self.step('步骤7.{}:截图对比'.format(retry)) launcher_pic = 'launcher.jpeg' self.take_picture_to_local(launcher_pic) similarity = self.compare_image_similarity(launcher_pic) @@ -50,12 +55,18 @@ class Launcher(ITestCase): break except: if retry < 2: - self.step('步骤8:启动失败,重启设备,第{}次重试'.format(retry+1)) + self.step('步骤8.{}:启动失败,重启设备,重试'.format(retry)) self.common_oh.shell(self.Phone1, 'rm -rf /data/*') self.common_oh.safeReboot(self.Phone1) - self.common_oh.wait(self.Phone1, 10) + for i in range(5): + try: + print_info('检查屏幕是否已点亮') + self.common_oh.getScreenStatus(self.Phone1) + break + except: + self.common_oh.wait(self.Phone1, 10) else: - self.step('步骤8:重试了3次,启动失败,收集crash') + 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)) self.common_oh.pullFile(self.Phone1, '/data/log/faultlog/temp/after_test_cppcrash{}.tar'.format(self.device_name), os.path.normpath(self.local_save_path)) # fault logger