From 8686da3607684c6d56c76c72af3bcf7d36f79cb7 Mon Sep 17 00:00:00 2001 From: hongll Date: Thu, 10 Jul 2025 15:11:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E4=BE=8B1=E3=80=81?= =?UTF-8?q?=E7=94=A8=E4=BE=8B24=E6=B5=8B=E8=AF=95=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/autotest/aw/push_remove_source.py | 13 ------------- .../level0/case24_sub001/listen_test.cfg | 2 +- .../level0/case24_sub001/listen_test.json | 4 ++-- .../testcases/level0/case01_listen001.py | 2 +- .../testcases/level0/case24_sub001.py | 19 +++++++++---------- 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/test/autotest/aw/push_remove_source.py b/test/autotest/aw/push_remove_source.py index 0e271986..f31d7fad 100644 --- a/test/autotest/aw/push_remove_source.py +++ b/test/autotest/aw/push_remove_source.py @@ -72,19 +72,6 @@ def remove_source(source_path, driver, sn): driver.Storage.remove_file("/system/etc/init/listen_test.cfg") driver.Storage.remove_file("/system/etc/init/listen_test.json") - if "sa_lib_listen_test_path" in source_path: - driver.Storage.remove_file("/system/lib/liblisten_test.z.so") - - if "sa_proxy_path" in source_path: - driver.Storage.remove_file("/system/lib/libtest_sa_proxy.z.so") - - - if "sa_lib_audio_ability" in source_path: - driver.Storage.remove_file("/system/lib/libtest_audio_ability.z.so") - - if "sa_ondemand_path" in source_path: - driver.Storage.remove_file("/system/bin/ondemand") - if "sa_para_path" in source_path: driver.Storage.remove_file("/system/etc/param/samgr.para") driver.Storage.remove_file("/system/etc/param/samgr.para.dac") diff --git a/test/autotest/resource/level0/case24_sub001/listen_test.cfg b/test/autotest/resource/level0/case24_sub001/listen_test.cfg index 10a8006e..cb4036c2 100644 --- a/test/autotest/resource/level0/case24_sub001/listen_test.cfg +++ b/test/autotest/resource/level0/case24_sub001/listen_test.cfg @@ -2,7 +2,7 @@ "services":[{ "name":"listen_test", "path":["/system/bin/sa_main","/system/profile/listen_test.json"], - "ondemand":false, + "ondemand":true, "secon":"u:r:listen_test:s0", "permission":["ohos.permission.DISTRIBUTED_DATASYNC"], "uid":"system", diff --git a/test/autotest/resource/level0/case24_sub001/listen_test.json b/test/autotest/resource/level0/case24_sub001/listen_test.json index ab0a2723..95590211 100644 --- a/test/autotest/resource/level0/case24_sub001/listen_test.json +++ b/test/autotest/resource/level0/case24_sub001/listen_test.json @@ -4,14 +4,14 @@ { "name": 1494, "libpath": "liblisten_test.z.so", - "run-on-create": true, + "run-on-create": false, "distributed": false, "dump_level": 1 }, { "name": 1499, "libpath": "libtest_audio_ability.z.so", - "run-on-create": true, + "run-on-create": false, "distributed": false, "dump_level": 1 } diff --git a/test/autotest/testcases/level0/case01_listen001.py b/test/autotest/testcases/level0/case01_listen001.py index 14a03e7f..ede61b53 100644 --- a/test/autotest/testcases/level0/case01_listen001.py +++ b/test/autotest/testcases/level0/case01_listen001.py @@ -42,7 +42,7 @@ class case01_listen001(TestCase): device_logger.start_log(get_report_dir() + "//case01_listen001.txt") driver.System.execute_command("ps -e | grep resource_schedule_service") driver.System.execute_command("kill -9 `pidof resource_schedule_service`") - time.sleep(2) + time.sleep(5) device_logger.stop_log() CheckPoint("'AddProc:resource_schedule_service and rm DeadProc:resource_schedule_service' is present in the logs") device_logger.check_log("AddProc:resource_schedule_service", EXCEPTION=True) diff --git a/test/autotest/testcases/level0/case24_sub001.py b/test/autotest/testcases/level0/case24_sub001.py index 43986074..67c63592 100644 --- a/test/autotest/testcases/level0/case24_sub001.py +++ b/test/autotest/testcases/level0/case24_sub001.py @@ -30,6 +30,7 @@ from hypium import UiDriver import disk_drop_log from get_source_path import get_source_path from push_remove_source import push_source, remove_source +from hypium.action.os_hypium.device_logger import DeviceLogger class case24_sub001(TestCase): @@ -53,8 +54,11 @@ class case24_sub001(TestCase): def test_step(self): driver = self.driver + device_logger = DeviceLogger(driver).set_filter_string("01800") + device_logger.start_log(get_report_dir() + "//case024_sub001.txt") + driver.system.execute_command("ondemand sa load 1494") result = driver.System.execute_command("hidumper -ls") - max_wait_time = 5 + max_wait_time = 10 wait_time = 0 while ("1494" not in result and wait_time <= max_wait_time): wait_time += 1 @@ -63,17 +67,12 @@ class case24_sub001(TestCase): CheckPoint("1494 is loaded after booting up") assert "1494" in result - log_revice_path = os.path.join(self.get_case_report_path(), "disk_drop") - disk_drop_log.pulling_disk_dropping_logs(log_revice_path, self.driver) - disk_drop_log.parse_disk_dropping_logs(log_revice_path) - result = disk_drop_log.check_disk_dropping_logs(log_revice_path, - "OnAddSystemAbility systemAbilityId:1901 added!") + time.sleep(3) + device_logger.stop_log() CheckPoint("The log contains 'ListenAbility: OnAddSystemAbility systemAbilityId:1901 added!'") - assert result is True - result = disk_drop_log.check_disk_dropping_logs(log_revice_path, - "OnAddSystemAbility systemAbilityId:4700 added!") + device_logger.check_log("OnAddSystemAbility systemAbilityId:4700 added!", EXCEPTION=True) CheckPoint("The log contains 'ListenAbility: OnAddSystemAbility systemAbilityId:4700 added!'") - assert result is True + device_logger.check_log("OnAddSystemAbility systemAbilityId:4700 added!", EXCEPTION=True) def teardown(self): remove_source(source_path=self.source_path, driver=self.driver, sn=self.sn) -- Gitee