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

Commit 3de710f8 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge changes I3b20be28,I7118025c 

* changes:
  Revert "init: disable oneshot_on test"
  init: require root for oneshot_on test
parents 6f6beb3c 91537d30

init/oneshot_on_test.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,12 @@ using android::base::SetProperty; 
using android::base::WaitForProperty;

using android::base::WaitForProperty;

using namespace std::literals;

using namespace std::literals;





#if 0  // TODO(b/152637928): this test is flaky

TEST(init, oneshot_on) {

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.

    // Bootanim shouldn't be running once the device has booted.

    ASSERT_EQ("stopped", GetProperty("init.svc.bootanim", ""));

    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.

    // Now that oneshot is enabled again, bootanim should transition into the 'stopped' state.

    EXPECT_TRUE(WaitForProperty("init.svc.bootanim", "stopped", 10s));

    EXPECT_TRUE(WaitForProperty("init.svc.bootanim", "stopped", 10s));

}
 
}
 
#endif