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

Commit 4fa4dd5a authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "init_kill_services_test: clearer logs" am: bc21816d am: 3c6f1702... 

Merge "init_kill_services_test: clearer logs" am: bc21816d am: 3c6f1702 am: 1d307c6f am: 6191d7f7

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



Change-Id: Ie8a5fb73cfcdef00c45304f86e9f0337e0632260
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08a8eaf8 6191d7f7

init/test_kill_services/init_kill_services_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ void ExpectKillingServiceRecovers(const std::string& service_name) { 


    const std::string initial_pid = GetProperty(pid_prop, "");



    EXPECT_EQ("running", GetProperty(status_prop, "")) << status_prop;

    EXPECT_NE("", initial_pid) << pid_prop;

    ASSERT_EQ("running", GetProperty(status_prop, "")) << status_prop;

    ASSERT_NE("", initial_pid) << pid_prop;



    EXPECT_EQ(0, system(("kill -9 " + initial_pid).c_str()));