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

Merge changes I3b20be28,I7118025c

Browse source 
* changes:
  Revert "init: disable oneshot_on test"
  init: require root for oneshot_on test
This commit is contained in:
Tom Cherry 2020-03-30 18:03:00 +00:00 • committed by Gerrit Code Review
commit 3de710f84f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init/oneshot_on_test.cpp
View file

@ -25,8 +25,12 @@ using android::base::SetProperty;
using android::base::WaitForProperty;
using namespace std::literals;
#if 0 // TODO(b/152637928): this test is flaky
TEST(init, oneshot_on) {
if (getuid() != 0) {
GTEST_SKIP() << "Skipping test, must be run as root.";
return;
}
// Bootanim shouldn't be running once the device has booted.
ASSERT_EQ("stopped", GetProperty("init.svc.bootanim", ""));
@ -43,4 +47,3 @@ TEST(init, oneshot_on) {
// Now that oneshot is enabled again, bootanim should transition into the 'stopped' state.
EXPECT_TRUE(WaitForProperty("init.svc.bootanim", "stopped", 10s));
}
#endif