ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: Fix and re-enable the init#StartConsole test" am: 7bc5a7ef5f

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

Change-Id: I011da24acae1e06f2435c2778f0dcbd189ad169b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-12-01 05:20:40 +00:00 • committed by Automerger Merge Worker
commit 97f5b24c94
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
init/init_test.cpp
View file

@ -194,10 +194,9 @@ service A something
}
TEST(init, StartConsole) {
// Two different failures have been observed for this test: (1) No
// permission to open /dev/console and (2) getsid() != pid. Skip this test
// until these failures have been root-caused and fixed.
GTEST_SKIP() << "This test needs to be improved";
if (access("/dev/console", F_OK) < 0) {
GTEST_SKIP() << "/dev/console not found";
}
std::string init_script = R"init(
service console /system/bin/sh
class core
@ -205,7 +204,7 @@ service console /system/bin/sh
disabled
user root
group root shell log readproc
seclabel u:r:su:s0
seclabel u:r:shell:s0
setenv HOSTNAME console
)init";
@ -219,7 +218,7 @@ service console /system/bin/sh
ASSERT_RESULT_OK(service->Start());
const pid_t pid = service->pid();
ASSERT_GT(pid, 0);
EXPECT_EQ(getsid(pid), pid);
EXPECT_NE(getsid(pid), 0);
service->Stop();
}