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

Commit 517d0004 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init_kill_services_test: wait 120s for apexd" am: b190adfc am: c2d3fcb0 am: 695e1ced 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2635202



Change-Id: I52d2c7fbff6439b090e35f45358bdc5a0f6ad5c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a824e157 695e1ced

init/test_kill_services/init_kill_services_test.cpp

+1 −1
Original line number 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

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