From 14e7b76dcf917041b2d2e6256c850fe9f987c35d Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 22 Jun 2023 18:56:07 +0000 Subject: [PATCH] init_kill_services_test: wait 120s for apexd This is likely waiting for the Java garbage collector to run, and due to the lockless implementation of BinderProxyNativeData and BpBinder, it's very difficult to efficiently force this object to be deleted. Change-Id: I4df667b9b47327967a43d75664fb506b8704f905 Fixes: 285458033 Test: N/A --- init/test_kill_services/init_kill_services_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/test_kill_services/init_kill_services_test.cpp b/init/test_kill_services/init_kill_services_test.cpp index dd4606449..510ad8aee 100644 --- a/init/test_kill_services/init_kill_services_test.cpp +++ b/init/test_kill_services/init_kill_services_test.cpp @@ -32,7 +32,7 @@ void ExpectKillingServiceRecovers(const std::string& service_name) { // b/280514080 - servicemanager will restart apexd, and apexd will restart the // system when crashed. This is fine as the device recovers, but it causes // flakes in this test. - ASSERT_TRUE(WaitForProperty("init.svc.apexd", "stopped", 60s)) + ASSERT_TRUE(WaitForProperty("init.svc.apexd", "stopped", 120s)) << (system("cat /dev/binderfs/binder_logs/state"), "apexd won't stop"); LOG(INFO) << "hello " << service_name << "!";