Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14e7b76d authored by Steven Moreland's avatar Steven Moreland
Browse files

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
parent 90fc835d

init/test_kill_services/init_kill_services_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ void ExpectKillingServiceRecovers(const std::string& service_name) { 
    // b/280514080 - servicemanager will restart apexd, and apexd will restart the

    // b/280514080 - servicemanager will restart apexd, and apexd will restart the

    // system when crashed. This is fine as the device recovers, but it causes

    // system when crashed. This is fine as the device recovers, but it causes

    // flakes in this test.

    // 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");

            << (system("cat /dev/binderfs/binder_logs/state"), "apexd won't stop");





    LOG(INFO) << "hello " << service_name << "!";

    LOG(INFO) << "hello " << service_name << "!";