diff --git a/cases/smoke/basic/screenshot32/xdevice_smoke/config/user_config.xml b/cases/smoke/basic/screenshot32/xdevice_smoke/config/user_config.xml index 3e9d721961ca47c9a2a8174f1cf10af1e8a95c55..a1a9bc7cc27232b2cd4dc1e9c9ad09a35f0d027c 100644 --- a/cases/smoke/basic/screenshot32/xdevice_smoke/config/user_config.xml +++ b/cases/smoke/basic/screenshot32/xdevice_smoke/config/user_config.xml @@ -65,5 +65,5 @@ ON - INFO + DEBUG \ No newline at end of file diff --git a/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py b/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py index e5da0965e62a92033fc7db961575c29c37065068..6389901018f95fa9ad59b6bd6727a37557a8e5ad 100644 --- a/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py +++ b/cases/smoke/basic/screenshot32/xdevice_smoke/testcases/Launcher.py @@ -16,31 +16,32 @@ class Launcher(ITestCase): super().__init__(controllers) def setup(self): - self.step('预置条件1:点亮屏幕') - self.common_oh.wake(self.Phone1) - self.step('预置条件2:回到桌面') - self.common_oh.goHome(self.Phone1) - self.common_oh.wait(self.Phone1, 1) + pass def process(self): for retry in range(3): try: - self.step('步骤1:创建临时目录') + self.step('步骤1:点亮屏幕') + self.common_oh.wake(self.Phone1) + self.step('步骤2:回到桌面') + self.common_oh.goHome(self.Phone1) + self.common_oh.wait(self.Phone1, 1) + self.step('步骤3:创建临时目录') self.common_oh.shell(self.Phone1, 'mkdir -p /data/local/tmp/screen_test/train_set') # 屏幕常亮 - self.step('步骤2:设置屏幕常亮') + 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('步骤3:检查屏幕状态') + self.step('步骤5:检查屏幕状态') self.asserts.assert_in('State=2', power_state) # 控件检查 - self.step('步骤4:检查是否在桌面') + self.step('步骤6:检查是否在桌面') self.common_oh.checkIfTextExist(self.Phone1, '相机') self.common_oh.checkIfTextExist(self.Phone1, '音乐') # 截图对比 - self.step('步骤5:截图对比') + self.step('步骤7:截图对比') launcher_pic = 'launcher.jpeg' self.take_picture_to_local(launcher_pic) similarity = self.compare_image_similarity(launcher_pic) @@ -49,11 +50,12 @@ class Launcher(ITestCase): break except: if retry < 2: - self.step('步骤6:启动失败,重启设备') + self.step('步骤8:启动失败,重启设备,第{}次重试'.format(retry+1)) self.common_oh.shell(self.Phone1, 'rm -rf /data/*') self.common_oh.safeReboot(self.Phone1) + self.common_oh.wait(self.Phone1, 2) else: - self.step('步骤7:启动失败,收集crash') + self.step('步骤8:重试了3次,启动失败,收集crash') 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