diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0100.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0100.json new file mode 100644 index 0000000000000000000000000000000000000000..b764571dcfdf67a148bfd6310512fdd2b5b0dcb8 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0100.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0100.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0100.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0100.py new file mode 100644 index 0000000000000000000000000000000000000000..f958bb793252b58faea0bc494a0bba34ece81557 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0100.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + + +SubStartupAppspawnDevicedebug0100(TestCase): + + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + Step("安装测试hap并打开") + global bundle_name + bundle_name = "com.example.myapplication" + hap_path = Common.sourcepath('release.hap', "sub_startup_appspawn_devicedebug") + hap = self.driver.AppManager.has_app(bundle_name) + if hap: + self.driver.AppManager.clear_app_data(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) + self.driver.AppManager.install_app(hap_path) + else: + self.driver.AppManager.install_app(hap_path) + self.driver.AppManager.start_app(bundle_name) + pid1 = self.driver.System.get_pid(bundle_name) + + Step("开启日志") + device_logger = DeviceLogger(self.driver).set_filter_string("C02C11") + log_name = 'LOG_' + os.path.basename(__file__).split('.')[0] + device_logger.start_log("testFile/sub_startup_appspawn_devicedebug/%s.txt" % log_name) + + Step("devicedebug发送kill信号") + self.driver.shell("devicedebug kill -9 %d" % pid1) + pid2 = self.driver.System.get_pid(bundle_name) + self.driver.Assert.equal(pid1, pid2) + + Step("匹配日志") + device_logger.stop_log() + time.sleep(10) + assert device_logger.check_log("devicedebug cmd kill start signal[9], pid[%d]" % pid1) + assert device_logger.check_log("appspawn devicedebug process is not debuggable, pid=%d" % pid1) + + def teardown(self): + Step("收尾工作.................") + self.driver.AppManager.stop_app(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0200.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0200.json new file mode 100644 index 0000000000000000000000000000000000000000..cb9198c746feec4cd142a58be74f8ba2bdeedb30 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0200.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0200.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0200.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0200.py new file mode 100644 index 0000000000000000000000000000000000000000..3c84650580d678b803ef6286c38e7df20b822dbb --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0200.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + + +SubStartupAppspawnDevicedebug0200(TestCase): + + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + Step("安装测试hap并打开") + global bundle_name + bundle_name = "com.example.myapplication" + hap_path = Common.sourcepath('debug.hap', "sub_startup_appspawn_devicedebug") + hap = self.driver.AppManager.has_app(bundle_name) + if hap: + self.driver.AppManager.clear_app_data(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) + self.driver.AppManager.install_app(hap_path) + else: + self.driver.AppManager.install_app(hap_path) + self.driver.AppManager.start_app(bundle_name) + pid1 = self.driver.System.get_pid(bundle_name) + + Step("开启日志") + device_logger = DeviceLogger(self.driver).set_filter_string("C02C11") + log_name = 'LOG_' + os.path.basename(__file__).split('.')[0] + device_logger.start_log("testFile/sub_startup_appspawn_devicedebug/%s.txt" % log_name) + + Step("devicedebug发送kill信号") + self.driver.shell("devicedebug kill -9 %d" % pid1) + + Step("匹配日志") + device_logger.stop_log() + time.sleep(10) + assert device_logger.check_log("devicedebug cmd kill start signal[9], pid[%d]" % pid1) + assert device_logger.check_log("appspawn devicedebug debugable=1, pid=%d, signal=9" % pid1) + assert device_logger.check_log("devicedebug manager process exit. ret=0") + self.driver.AppManager.start_app(bundle_name) + pid2 = self.driver.System.get_pid(bundle_name) + self.driver.Assert.not_equal(pid1, pid2) + + def teardown(self): + Step("收尾工作.................") + self.driver.AppManager.stop_app(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0300.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0300.json new file mode 100644 index 0000000000000000000000000000000000000000..e560671a212be51ebb45ee3a392cd21c95592c14 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0300.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0300.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0300.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0300.py new file mode 100644 index 0000000000000000000000000000000000000000..9d1359d36e917873e22f5418664943a6e96fa6a6 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0300.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + +SubStartupAppspawnDevicedebug0300(TestCase): + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + Step("安装测试hap并打开") + global bundle_name + bundle_name = "com.example.myapplication" + hap_path = Common.sourcepath('debug.hap', "sub_startup_appspawn_devicedebug") + hap = self.driver.AppManager.has_app(bundle_name) + if hap: + self.driver.AppManager.clear_app_data(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) + self.driver.AppManager.install_app(hap_path) + else: + self.driver.AppManager.install_app(hap_path) + + Step("开启日志") + device_logger = DeviceLogger(self.driver).set_filter_string("C02C11") + log_name = 'LOG_' + os.path.basename(__file__).split('.')[0] + device_logger.start_log("testFile/sub_startup_appspawn_devicedebug/%s.txt" % log_name) + + Step("devicedebug发送kill信号") + signal_lst = [1, 9, 11, 15, 64] + log_dict = {} + # 本地跑1-64的 但是由于太费时间，流水线跑signal_lst中这几个有代表性的就可以了 + for signal in signal_lst: # range(1, 65)替换signal_lst + self.driver.AppManager.start_app(bundle_name) + pid = self.driver.System.get_pid(bundle_name) + log_dict.update({signal: pid}) + self.driver.shell("devicedebug kill -%d %d" % (signal, pid)) + self.driver.AppManager.stop_app(bundle_name) + + Step("匹配日志") + device_logger.stop_log() + time.sleep(10) + for signal, pid in log_dict.items(): + assert device_logger.check_log("devicedebug cmd kill start signal[%d], pid[%d]" % (signal, pid)) + assert device_logger.check_log("appspawn devicedebug debugable=1, pid=%d, signal=%d" % (pid, signal)) + assert device_logger.check_log("devicedebug manager process exit. ret=0") + + def teardown(self): + Step("收尾工作.................") + self.driver.AppManager.stop_app(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0400.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0400.json new file mode 100644 index 0000000000000000000000000000000000000000..9b0248bf81ca8671446934d04157d36d1123905c --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0400.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0400.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0400.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0400.py new file mode 100644 index 0000000000000000000000000000000000000000..023bb1226f6137f20697152418fa5878012f49eb --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0400.py @@ -0,0 +1,88 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + + +SubStartupAppspawnDevicedebug0400(TestCase): + + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + Step("安装测试hap并打开") + global bundle_name + bundle_name = "com.example.myapplication" + hap_path = Common.sourcepath('debug.hap', "sub_startup_appspawn_devicedebug") + hap = self.driver.AppManager.has_app(bundle_name) + if hap: + self.driver.AppManager.clear_app_data(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) + self.driver.AppManager.install_app(hap_path) + else: + self.driver.AppManager.install_app(hap_path) + + Step("开启日志") + device_logger = DeviceLogger(self.driver).set_filter_string("C02C11") + log_name = 'LOG_' + os.path.basename(__file__).split('.')[0] + device_logger.start_log("testFile/sub_startup_appspawn_devicedebug/%s.txt" % log_name) + + Step("devicedebug发送kill信号") + signal_lst = ["65", "0", "SIGKILL", "null", "undefined", "sigkill"] + for signal in signal_lst: + self.driver.AppManager.start_app(bundle_name) + pid1 = self.driver.System.get_pid(bundle_name) + self.driver.shell("devicedebug kill -%s %d" % (signal, pid1)) + pid2 = self.driver.System.get_pid(bundle_name) + self.driver.Assert.equal(pid1, pid2) + + Step("匹配日志") + device_logger.stop_log() + time.sleep(10) + for i in range(len(signal_lst)): + assert device_logger.check_log("devicedebug manager process start.") + assert device_logger.check_log("devicedebug manager process exit. ret=22") + assert device_logger.check_log("signal is 65 not in [1, 64]") + assert device_logger.check_log("signal is 0 not in [1, 64]", expect_match_times=len(signal_lst)-1) + + + def teardown(self): + Step("收尾工作.................") + self.driver.AppManager.stop_app(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0500.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0500.json new file mode 100644 index 0000000000000000000000000000000000000000..eff74779ddd26d5b3738cda0f92f17e1a78604a0 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0500.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0500.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0500.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0500.py new file mode 100644 index 0000000000000000000000000000000000000000..a16ae9e2d2b38f2fc6e6e2731477e6f06f5e0d70 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0500.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + + +SubStartupAppspawnDevicedebug0500(TestCase): + + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + Step("安装测试hap并打开") + global bundle_name + bundle_name = "com.example.myapplication" + hap_path = Common.sourcepath('debug.hap', "sub_startup_appspawn_devicedebug") + hap = self.driver.AppManager.has_app(bundle_name) + if hap: + self.driver.AppManager.clear_app_data(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) + self.driver.AppManager.install_app(hap_path) + else: + self.driver.AppManager.install_app(hap_path) + + Step("开启日志") + device_logger = DeviceLogger(self.driver).set_filter_string("C02C11") + log_name = 'LOG_' + os.path.basename(__file__).split('.')[0] + device_logger.start_log("testFile/sub_startup_appspawn_devicedebug/%s.txt" % log_name) + + Step("devicedebug发送kill信号") + self.driver.AppManager.start_app(bundle_name) + pid1 = self.driver.System.get_pid(bundle_name) + self.driver.shell("devicedebug kill %d" % pid1) + pid2 = self.driver.System.get_pid(bundle_name) + self.driver.Assert.equal(pid1, pid2) + + Step("匹配日志") + device_logger.stop_log() + time.sleep(10) + assert device_logger.check_log("devicedebug manager process start.") + assert device_logger.check_log("devicedebug cmd operator num is 3 < 4") + assert device_logger.check_log("devicedebug manager process exit. ret=18") + + def teardown(self): + Step("收尾工作.................") + self.driver.AppManager.stop_app(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0600.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0600.json new file mode 100644 index 0000000000000000000000000000000000000000..acbcf0b7151d7bd1cd165e01da4ab8acc0aaa758 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0600.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0600.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0600.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0600.py new file mode 100644 index 0000000000000000000000000000000000000000..8446d1c52685bd120bc2596851f942b32b501634 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0600.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + + +SubStartupAppspawnDevicedebug0600(TestCase): + + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + Step("开启日志") + device_logger = DeviceLogger(self.driver).set_filter_string("C02C11") + log_name = 'LOG_' + os.path.basename(__file__).split('.')[0] + device_logger.start_log("testFile/sub_startup_appspawn_devicedebug/%s.txt" % log_name) + + Step("devicedebug发送kill信号") + pid = self.driver.System.get_pid("nwebspawn") + self.driver.shell("devicedebug kill -9 %d" % pid) + + Step("匹配日志") + device_logger.stop_log() + time.sleep(10) + assert device_logger.check_log("devicedebug cmd kill start signal[9], pid[%d]" % pid) + assert device_logger.check_log("appspawn devicedebug process is not debuggable, pid=%d" % pid) + assert device_logger.check_log("devicedebug manager process exit. ret=218103838") + + def teardown(self): + Step("收尾工作.................") \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0700.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0700.json new file mode 100644 index 0000000000000000000000000000000000000000..2fc5b2e47ef7f2ff348429474728a878898f19c9 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0700.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0700.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0700.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0700.py new file mode 100644 index 0000000000000000000000000000000000000000..6bc9541124f4f7cf506b004f2f1d7bba962225b2 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0700.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + + +SubStartupAppspawnDevicedebug0700(TestCase): + + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + Step("安装测试hap并打开") + global bundle_name + bundle_name = "com.example.exe_sys_cmd" + hap_path = Common.sourcepath('debug_fork.hap', "sub_startup_appspawn_devicedebug") + hap = self.driver.AppManager.has_app(bundle_name) + if hap: + self.driver.AppManager.clear_app_data(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) + self.driver.AppManager.install_app(hap_path) + else: + self.driver.AppManager.install_app(hap_path) + self.driver.AppManager.start_app(bundle_name) + result01 = self.driver.shell("ps -ef|grep exe_sys_cmd|grep -v grep").split("\n") + childprocess_pid = result01[1].split()[1] + + Step("开启日志") + device_logger = DeviceLogger(self.driver).set_filter_string("C02C11") + log_name = 'LOG_' + os.path.basename(__file__).split('.')[0] + device_logger.start_log("testFile/sub_startup_appspawn_devicedebug/%s.txt" % log_name) + + Step("devicedebug发送kill信号") + self.driver.shell("devicedebug kill -9 %s" % childprocess_pid) + + Step("匹配日志") + device_logger.stop_log() + time.sleep(10) + assert device_logger.check_log("appspawn devicedebug get app info unsuccess, pid=%s" % childprocess_pid) + assert device_logger.check_log("devicedebug manager process exit. ret=218103837") + + def teardown(self): + Step("收尾工作.................") + self.driver.AppManager.stop_app(bundle_name) + self.driver.AppManager.uninstall_app(bundle_name) \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0800.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0800.json new file mode 100644 index 0000000000000000000000000000000000000000..aab5e2c2805dc36b8ef13a69af0a88a14bf61895 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0800.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0800.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0800.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0800.py new file mode 100644 index 0000000000000000000000000000000000000000..f37c3217c7d7ef96188f1551ac69aad733412102 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0800.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + + +SubStartupAppspawnDevicedebug0800(TestCase): + + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + devicedebug_help_dict = [ + "devicedebug: 'aaa' is not a valid devicedebug command. See 'devicedebug help'.", + "usage: devicedebug ", + "These are common devicedebug commands list:", + " help list available commands", + " kill send a signal(1-64) to a process" + ] + result_dict = list(filter(lambda x: x != "\r", self.driver.shell("devicedebug aaa").split("\n"))) + result_dict = list(filter(None, result_dict)) + for result in result_dict: + self.driver.Assert.contains(devicedebug_help_dict, result.rstrip("\r")) + + def teardown(self): + Step("收尾工作.................") \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0900.json b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0900.json new file mode 100644 index 0000000000000000000000000000000000000000..93b618704548e09bebfa9de86151bd64cd1cc8d2 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0900.json @@ -0,0 +1,14 @@ +{ + "description": "Config for OpenHarmony devicetest test cases", + "environment": [ + { + "type": "device" + } + ], + "driver": { + "type": "DeviceTest", + "py_file": [ + "sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0900.py" + ] + } +} \ No newline at end of file diff --git a/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0900.py b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0900.py new file mode 100644 index 0000000000000000000000000000000000000000..f7d2d29460882204f25ee4bea3b6b5317b519a63 --- /dev/null +++ b/test/autotest/sub_startup_appspawn_devicedebug/sub_startup_appspawn_devicedebug_0900.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import time +from devicetest.core.test_case import TestCase, Step +from hypium import * +from hypium.action.os_hypium.device_logger import DeviceLogger +from aw import Common + + +SubStartupAppspawnDevicedebug0900(TestCase): + + def __init__(self, controllers): + self.tag = self.__class__.__name__ + TestCase.__init__(self, self.tag, controllers) + self.driver = UiDriver(self.device1) + + def setup(self): + Step(self.devices[0].device_id) + global device + device = self.driver.shell("param get const.product.model") + device = device.replace("\n", "").replace(" ", "") + device = str(device) + Step(device) + # 解锁屏幕 + wake = self.driver.Screen.is_on() + time.sleep(0.5) + if wake: + self.driver.ScreenLock.unlock() + else: + self.driver.Screen.wake_up() + self.driver.ScreenLock.unlock() + self.driver.Screen.enable_stay_awake() + + def process(self): + devicedebug_help_dict = [ + "usage: devicedebug ", + "These are common devicedebug commands list:", + " help list available commands", + " kill send a signal(1-64) to a process" + ] + result_dict = list(filter(lambda x: x != "\r", self.driver.shell("devicedebug help").split("\n"))) + result_dict = list(filter(None, result_dict)) + for result in result_dict: + self.driver.Assert.contains(devicedebug_help_dict, result.rstrip("\r")) + + def teardown(self): + Step("收尾工作.................") \ No newline at end of file diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0100.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0100.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0100.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0100.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0100.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0100.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0100.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0100.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0200.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0200.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0200.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0200.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0200.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0200.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0200.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0200.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0300.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0300.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0300.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0300.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0300.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0300.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0300.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0300.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0400.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0400.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0400.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0400.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0400.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0400.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0400.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0400.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0500.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0500.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0500.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0500.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0500.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0500.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0500.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0500.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0700.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0700.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0700.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0700.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0700.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0700.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0700.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0700.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0900.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0900.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0900.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0900.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0900.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0900.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_0900.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0900.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1000.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1000.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1000.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1000.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1000.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1000.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1000.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1000.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1100.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1100.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1100.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1100.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1100.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1100.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1100.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1100.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1200.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1200.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1200.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1200.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1200.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1200.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1200.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1200.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1300.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1300.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1300.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1300.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1300.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1300.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1300.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1300.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1400.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1400.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1400.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1400.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1400.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1400.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1400.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1400.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1500.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1500.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1500.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1500.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1500.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1500.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1500.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1500.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1600.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1600.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1600.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1600.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1600.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1600.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1600.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1600.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1700.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1700.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1700.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1700.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1700.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1700.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1700.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1700.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1800.json b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1800.json similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1800.json rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1800.json diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1800.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1800.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1800.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1800.py diff --git a/test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1900.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1900.py similarity index 100% rename from test/autotest/SubStartupAppspawnNativespawn/sub_startup_appspawn_nativespawn_1900.py rename to test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1900.py