diff --git a/device_info/device_info_stub.cpp b/device_info/device_info_stub.cpp index 7ad2f97decb4734491b1114213d86e33e6a67c2a..a9a1dc88a93f4c3977501346c256f5e7f0d9e263 100644 --- a/device_info/device_info_stub.cpp +++ b/device_info/device_info_stub.cpp @@ -42,9 +42,9 @@ REGISTER_SYSTEM_ABILITY_BY_ID(DeviceInfoService, SYSPARAM_DEVICE_SERVICE_ID, tru static std::mutex g_lock; static time_t g_lastTime; #ifndef STARTUP_INIT_TEST -static const int DEVICE_INFO_EXIT_TIMEOUT_MS = 60; +static const int DEVICE_INFO_EXIT_TIMEOUT_MS = 15; #else -static const int DEVICE_INFO_EXIT_TIMEOUT_MS = 2; +static const int DEVICE_INFO_EXIT_TIMEOUT_MS = 3; #endif static void UnloadDeviceInfoSa(int signo) @@ -53,7 +53,7 @@ static void UnloadDeviceInfoSa(int signo) time_t currTime; (void)time(&currTime); if (difftime(currTime, g_lastTime) < DEVICE_INFO_EXIT_TIMEOUT_MS) { - alarm(DEVICE_INFO_EXIT_TIMEOUT_MS / 2); // 2 half + alarm(DEVICE_INFO_EXIT_TIMEOUT_MS / 3); // 3 half return; } DINFO_LOGI("DeviceInfoService::UnloadDeviceInfoSa"); diff --git a/services/etc/init.cfg b/services/etc/init.cfg index eb843118531f993e8d168f8ba142e7cb2dc0f2ee..972caef4d220847cc6ac163ef3537b473f09665d 100755 --- a/services/etc/init.cfg +++ b/services/etc/init.cfg @@ -27,8 +27,7 @@ "bootchart start", "chown access_token access_token /dev/access_token_id", "chmod 0666 /dev/access_token_id", - "trigger init-hitrace", - "trigger init-trace" + "trigger init-hitrace" ] }, { "name" : "init", diff --git a/services/modules/trace/init_trace_static.c b/services/modules/trace/init_trace_static.c index cd12920ffb850296a933bf42f0f0125ebbd7933a..dc15616913db468d226f06d22343d3f7ad2ae5e7 100644 --- a/services/modules/trace/init_trace_static.c +++ b/services/modules/trace/init_trace_static.c @@ -20,9 +20,6 @@ static int InitTraceEarlyHook(const HOOK_INFO *info, void *cookie) { if (GetBootEventEnable()) { PLUGIN_LOGI("init trace enabled."); -#ifndef STARTUP_INIT_TEST - InitModuleMgrInstall("inittrace"); -#endif return 0; } return 0; diff --git a/test/moduletest/deviceinfo_moduleTest.cpp b/test/moduletest/deviceinfo_moduleTest.cpp index 872ca909c227d7a3289fe15ad818e6697318f644..45cc103dff2ef6b56d5790aee9dfd0041975f121 100644 --- a/test/moduletest/deviceinfo_moduleTest.cpp +++ b/test/moduletest/deviceinfo_moduleTest.cpp @@ -50,7 +50,7 @@ HWTEST_F(DeviceInfoModuleTest, DeviceInfoGetUdid_001, TestSize.Level0) EXPECT_EQ(object != nullptr, 1); BEGET_ERROR_CHECK(object != nullptr, return, "Get deviceinfo manager object from samgr failed"); - std::this_thread::sleep_for(std::chrono::seconds(80)); // wait sa died 80s + std::this_thread::sleep_for(std::chrono::seconds(20)); // wait sa died 20s object = samgr->GetSystemAbility(SYSPARAM_DEVICE_SERVICE_ID); EXPECT_EQ(object == nullptr, 1); @@ -77,7 +77,7 @@ HWTEST_F(DeviceInfoModuleTest, DeviceInfoGetSerial_001, TestSize.Level0) EXPECT_EQ(object != nullptr, 1); BEGET_ERROR_CHECK(object != nullptr, return, "Get deviceinfo manager object from samgr failed"); - std::this_thread::sleep_for(std::chrono::seconds(80)); // wait sa died 80s + std::this_thread::sleep_for(std::chrono::seconds(20)); // wait sa died 20s object = samgr->GetSystemAbility(SYSPARAM_DEVICE_SERVICE_ID); EXPECT_EQ(object == nullptr, 1); diff --git a/test/moduletest/service_watcher_moduleTest.cpp b/test/moduletest/service_watcher_moduleTest.cpp index f7c1ba0c65c68f0c41b9af370fa8403967c0c08a..36bd02394f71cf09c91bbacec483ec08d63f7466 100644 --- a/test/moduletest/service_watcher_moduleTest.cpp +++ b/test/moduletest/service_watcher_moduleTest.cpp @@ -84,7 +84,7 @@ HWTEST_F(ServiceWatcherModuleTest, serviceWatcher_test_003, TestSize.Level0) auto status1 = GetServiceStatus(serviceName); EXPECT_TRUE(status1 == "running"); // wait service exit - std::this_thread::sleep_for(std::chrono::seconds(80)); // wait sa died 80s + std::this_thread::sleep_for(std::chrono::seconds(20)); // wait sa died 20s auto status2 = GetServiceStatus(serviceName); EXPECT_TRUE(status2 == "stopped");