diff --git a/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py b/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py index 5129489b849684ac608dd38b373471da2666dd8c..f46d2e7128f972aa913502e58ef38e695474d963 100644 --- a/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py +++ b/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py @@ -23,32 +23,23 @@ class Launcher(ITestCase): for retry in range(3): try: self.step('步骤1.{}:点亮屏幕'.format(retry)) - self.common_oh.wake(self.Phone1) - self.step('步骤2.{}:回到桌面'.format(retry)) - self.common_oh.goHome(self.Phone1) - self.common_oh.wait(self.Phone1, 1) - self.step('步骤3.{}:创建临时目录'.format(retry)) self.common_oh.shell(self.Phone1, 'mkdir -p /data/local/tmp/screen_test/train_set') + self.common_oh.shell(self.Phone1, 'power-shell wakeup;power-shell setmode 602') + self.step('步骤2.{}:滑动解锁'.format(retry)) + for i in range(2): + self.common_oh.shell(self.Phone1, 'uinput -T -m 425 400 425 1000;uinput -T -m 425 1000 425 400') + # 屏幕常亮 - self.step('步骤4{}:设置屏幕常亮'.format(retry)) + self.step('步骤3.{}:设置屏幕常亮'.format(retry)) DeviceInfoHelper.setSleep(self.Phone1, time_sleep=600) self.common_oh.click(self.Phone1, x=360, y=720) - # 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.common_oh.wait(self.Phone1, 3) # 控件检查 - self.step('步骤5.{}:检查是否在桌面'.format(retry)) - hasPhoto = self.common_oh.checkIfTextExist(self.Phone1, '相机', EXCEPTION=False) - if not hasPhoto: - self.common_oh.shell(self.Phone1, "hidumper -s WindowManagerService -a '-a'") - hasMusic = self.common_oh.checkIfTextExist(self.Phone1, '音乐', EXCEPTION=False) - if not hasMusic: - self.common_oh.shell(self.Phone1, "hidumper -s WindowManagerService -a '-a'") + self.step('步骤4.{}:检查是否在桌面'.format(retry)) + self.common_oh.checkIfTextExist(self.Phone1, '相机') + self.common_oh.checkIfTextExist(self.Phone1, '音乐') # 截图对比 - self.step('步骤6.{}:截图对比'.format(retry)) + self.step('步骤5.{}:截图对比'.format(retry)) launcher_pic = 'launcher.jpeg' self.take_picture_to_local(launcher_pic) similarity = self.compare_image_similarity(launcher_pic) @@ -57,18 +48,10 @@ class Launcher(ITestCase): break except: if retry < 2: - self.step('步骤7.{}:启动失败,重启设备,重试'.format(retry)) - # self.common_oh.shell(self.Phone1, 'rm -rf /data/*') + self.step('步骤6.{}:启动失败,重启设备,重试'.format(retry)) 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) else: - self.step('步骤8.{}:重试了3次,启动失败,收集crash'.format(retry)) + self.step('步骤7.{}:重试了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