commit 3de710f84f32d3dbfdaaea7f3d6f5dab63101f9f
author Tom Cherry <tomcherry@google.com> Mon Mar 30 18:03:00 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 30 18:03:00 2020 +0000
tree 1057c16b7ba1df999666767b560ba18648d29f20
parent 6f6beb3cc09724035d2e34d534582f771671ecbf
parent 91537d30de4c49bfba3a7b0fdb77d61edee02c45

Merge changes I3b20be28,I7118025c

* changes:
  Revert "init: disable oneshot_on test"
  init: require root for oneshot_on test

init/oneshot_on_test.cpp

diff --git a/init/oneshot_on_test.cpp b/init/oneshot_on_test.cpp
index 487e0ea..650f065 100644
--- a/init/oneshot_on_test.cpp
+++ b/init/oneshot_on_test.cpp
@@ -25,8 +25,12 @@
 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 @@
     // Now that oneshot is enabled again, bootanim should transition into the 'stopped' state.
     EXPECT_TRUE(WaitForProperty("init.svc.bootanim", "stopped", 10s));
 }
-#endif