Merge "init_kill_services_test: clearer logs" am: bc21816d5b am: 3c6f170262

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

Change-Id: Icc5bc62ea9b41b4138ef20bbbebc0b3c41d4189d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland 2023-03-16 01:04:56 +00:00 committed by Automerger Merge Worker
commit 1d307c6fdf

View file

@ -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()));