Merge "init_kill_services_test: clearer logs" am: bc21816d5b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2490898 Change-Id: I24c4e00ddd3f8e7b3fce3d94007955e763dfc838 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
3c6f170262
1 changed files with 2 additions and 2 deletions
|
|
@ -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()));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue