From 74cfc736be9e7fbebcecb114e428828cd030ea83 Mon Sep 17 00:00:00 2001 From: mikigo Date: Wed, 6 Nov 2024 04:38:45 -0500 Subject: [PATCH] fix some failed case --- case/test_dde_1271157.py | 4 ++-- case/test_dde_1271159.py | 3 ++- case/test_dde_1271169.py | 4 ++-- case/test_dde_1271199.py | 2 +- case/test_dde_1271201.py | 8 ++++---- case/test_dde_1271213.py | 4 ++-- case/test_dde_1271247.py | 4 ++-- case/test_dde_1271293.py | 2 +- case/test_dde_1271295.py | 2 +- case/test_dde_1271299.py | 4 ++-- case/test_dde_1271301.py | 10 +++++++--- 11 files changed, 26 insertions(+), 21 deletions(-) diff --git a/case/test_dde_1271157.py b/case/test_dde_1271157.py index 46b0116..cc5d6a9 100644 --- a/case/test_dde_1271157.py +++ b/case/test_dde_1271157.py @@ -15,5 +15,5 @@ class TestDdeCase(BaseCase): def teardown_method(self): """通过命令关闭日志收集工具""" - DdeMethod().kill_process_by_cmd("deepin-log-viewer") - DdeMethod().delete_all_file_in_documents_by_cmd() + DdeMethod().dde_dock.kill_process_by_cmd("deepin-log-viewer") + DdeMethod().dde_dock.delete_all_file_in_documents_by_cmd() diff --git a/case/test_dde_1271159.py b/case/test_dde_1271159.py index ee53ff8..83142f4 100644 --- a/case/test_dde_1271159.py +++ b/case/test_dde_1271159.py @@ -2,6 +2,7 @@ from src import sleep from apps.dde_autotest_euler.case.base_case import BaseCase from apps.dde_autotest_euler.method.dde_method import DdeMethod from src import Src +from setting import conf class TestDdeCase(BaseCase): @@ -11,7 +12,7 @@ class TestDdeCase(BaseCase): euler.open_software_by_launcher("rizhishoujigongju") sleep(6) euler.dde_polkit_agent.click_by_attr("EditableText_passwordinput") - Src.input_message("1") + Src.input_message(conf.PASSWORD) Src.enter() sleep(2) self.assert_image_exist_in_dde("test_dde_1271159_1") diff --git a/case/test_dde_1271169.py b/case/test_dde_1271169.py index ca2082f..ff61a24 100644 --- a/case/test_dde_1271169.py +++ b/case/test_dde_1271169.py @@ -14,5 +14,5 @@ class TestDdeCase(BaseCase): def teardown_method(self): """通过命令关闭日志收集工具""" - DdeMethod().kill_process_by_cmd("deepin-log-viewer") - DdeMethod().delete_all_file_in_documents_by_cmd() + DdeMethod().dde_dock.kill_process_by_cmd("deepin-log-viewer") + DdeMethod().dde_dock.delete_all_file_in_documents_by_cmd() diff --git a/case/test_dde_1271199.py b/case/test_dde_1271199.py index 45fa082..340be43 100644 --- a/case/test_dde_1271199.py +++ b/case/test_dde_1271199.py @@ -40,5 +40,5 @@ class TestDdeCase(BaseCase): def teardown_method(self): """通过命令关闭启动器""" - DdeMethod().kill_process_by_cmd("deepin-devicemanager") + DdeMethod().dde_dock.kill_process_by_cmd("deepin-devicemanager") sleep(3) diff --git a/case/test_dde_1271201.py b/case/test_dde_1271201.py index a9a876b..7a3eb48 100644 --- a/case/test_dde_1271201.py +++ b/case/test_dde_1271201.py @@ -10,7 +10,7 @@ class TestDdeCase(BaseCase): euler = DdeMethod() euler.open_software_by_launcher("shebeiguanliqi") sleep(6) - euler.deepin_devicemanager.export_file_by_attr("概况") + euler.export_file_by_attr("概况") euler.open_software_by_launcher("wenbenbianjiqi") sleep(6) euler.deepin_editor.deepin_editor.click_menu_btn_by_attr() @@ -23,7 +23,7 @@ class TestDdeCase(BaseCase): def teardown_method(self): """通过命令删除测试文件，关闭设备管理器以及文本编辑器器""" - DdeMethod().kill_process_by_cmd("deepin-devicemanager") - DdeMethod().kill_process_by_cmd("deepin-editor") - DdeMethod().delete_all_file_in_documents_by_cmd() + DdeMethod().dde_dock.kill_process_by_cmd("deepin-devicemanager") + DdeMethod().dde_dock.kill_process_by_cmd("deepin-editor") + DdeMethod().dde_dock.delete_all_file_in_documents_by_cmd() sleep(3) diff --git a/case/test_dde_1271213.py b/case/test_dde_1271213.py index f453ef6..e5bfd36 100644 --- a/case/test_dde_1271213.py +++ b/case/test_dde_1271213.py @@ -9,7 +9,7 @@ class TestDdeCase(BaseCase): DdeMethod().open_software_by_launcher("zitiguanli") sleep(6) DdeMethod().search_font_in_font_manager("FreeMono-bold Oblique") - self.assert_image_exist_in_dde("test_dde_1271213.png") + self.assert_ocr_exist("FreeMono") def test_dde_1271213_2(self): """在字体管理器中搜索非字体名称""" @@ -20,4 +20,4 @@ class TestDdeCase(BaseCase): def teardown_method(self): """关闭字体管理器""" - DdeMethod().close_window() + DdeMethod().dde_dock.kill_process("deepin-font-manager") diff --git a/case/test_dde_1271247.py b/case/test_dde_1271247.py index ec40804..bdb93a4 100644 --- a/case/test_dde_1271247.py +++ b/case/test_dde_1271247.py @@ -8,12 +8,12 @@ class TestDdeCase(BaseCase): def test_dde_1271247(self): """终端关闭""" app_name = "deepin-terminal" - DdeMethod().kill_process_by_cmd(app_name) + DdeMethod().dde_dock.kill_process_by_cmd(app_name) Src.ctrl_alt_t() sleep(6) DdeMethod().deepin_terminal.click_option_by_attr() sleep(1) - DdeMethod().click_by_ocr("远程管理") + DdeMethod().dde_dock.click_by_ocr("远程管理") sleep(1) x, y = Src.ocrx("未添加").result Src.click(x - 150, y) diff --git a/case/test_dde_1271293.py b/case/test_dde_1271293.py index f964c97..7358882 100644 --- a/case/test_dde_1271293.py +++ b/case/test_dde_1271293.py @@ -16,4 +16,4 @@ class TestDdeCase(BaseCase): def teardown_method(self): """关闭控制中心""" - DdeMethod().close_window() + DdeMethod().dde_control_center.kill_dde_control_center() diff --git a/case/test_dde_1271295.py b/case/test_dde_1271295.py index 2ecba23..202dff4 100644 --- a/case/test_dde_1271295.py +++ b/case/test_dde_1271295.py @@ -15,4 +15,4 @@ class TestDdeCase(BaseCase): def teardown_method(self): """关闭控制中心""" - DdeMethod().close_window() + DdeMethod().dde_control_center.kill_dde_control_center() diff --git a/case/test_dde_1271299.py b/case/test_dde_1271299.py index d70c6e4..df12691 100644 --- a/case/test_dde_1271299.py +++ b/case/test_dde_1271299.py @@ -7,10 +7,10 @@ class TestDdeCase(BaseCase): def test_dde_1271299(self): """添加系统语言""" DdeMethod().add_english_system_language_in_control_center() - self.assert_element_exist("/dde-control-center/American English - 美国英语") + self.assert_element_exist("$//dde-control-center//American English - 美国英语") def teardown_method(self): """清理环境，将新增的系统语言删除""" sleep(2) DdeMethod().delete_system_language_by_img() - DdeMethod().close_window() + DdeMethod().dde_control_center.kill_dde_control_center() diff --git a/case/test_dde_1271301.py b/case/test_dde_1271301.py index 73e2a90..61abc36 100644 --- a/case/test_dde_1271301.py +++ b/case/test_dde_1271301.py @@ -7,10 +7,14 @@ class TestDdeCase(BaseCase): def test_dde_1271301(self): """在控制中心中添加汉语键盘布局""" DdeMethod().add_hanyu_keyboard_layout_in_control_center() - self.assert_image_exist_in_dde("test_dde_1271301.png") + self.assert_ocr_exist("汉语") def teardown_method(self): """环境清理，将新增的汉语键盘布局删除""" sleep(2) - DdeMethod().delete_keyboard_layout_in_control_center() - DdeMethod().close_window() + try: + DdeMethod().delete_keyboard_layout_in_control_center() + except: + ... + finally: + DdeMethod().dde_control_center.kill_dde_control_center() -- Gitee