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

Commit 032b7e26 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init_kill_services_test: binder logs on apexd fail" am: 642929f8 am:... 

Merge "init_kill_services_test: binder logs on apexd fail" am: 642929f8 am: 0afb83f5 am: 61116c8b

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



Change-Id: I4a5c9bc3135400f025891f5b3eb8d6a698a532c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 930d70be 61116c8b

init/test_kill_services/init_kill_services_test.cpp

+4 −1
Original line number Diff line number Diff line
@@ -27,10 +27,13 @@ using ::android::base::WaitForProperty; 
using std::literals::chrono_literals::operator""s;



void ExpectKillingServiceRecovers(const std::string& service_name) {

    LOG(INFO) << "before we say hi to " << service_name << ", I can't have apexd around!";



    // 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)) << "apexd won't stop";

    ASSERT_TRUE(WaitForProperty("init.svc.apexd", "stopped", 60s))

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



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

    const std::string status_prop = "init.svc." + service_name;