From d7ae5a020c901eb49fb823cdc680b86701a18667 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Mon, 24 Aug 2020 14:33:03 -0400
Subject: [PATCH] Fix flaky tests by require root for minadbd_tests

minadbd tests require access to /dev/fuse, therefore needs to run as
root. This test has been flaky because root preparetor wasn't specified.

Bug: 165604640
Test: atest MinadbdServicesTest
Change-Id: I6ee1e2deede4352e28aad79c436ec5974e7d64f6
---
 minadbd/Android.bp      | 1 +
 minadbd/AndroidTest.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 4cdcac6d..b6ca59ef 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -135,4 +135,5 @@ cc_test {
     test_suites: [
         "device-tests",
     ],
+    require_root: true,
 }
diff --git a/minadbd/AndroidTest.xml b/minadbd/AndroidTest.xml
index 7ea235b7..dbcbac25 100644
--- a/minadbd/AndroidTest.xml
+++ b/minadbd/AndroidTest.xml
@@ -18,9 +18,10 @@
         <option name="cleanup" value="true" />
         <option name="push" value="minadbd_test->/data/local/tmp/minadbd_test" />
     </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
     <option name="test-suite-tag" value="apct" />
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />
         <option name="module-name" value="minadbd_test" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>