commit 3c24c571534c5c5e9b96891185ef4dff143a9fcd
author Jaewan Kim <jaewan@google.com> Fri Jul 07 11:03:46 2023 +0000
committer Jaewan Kim <jaewan@google.com> Fri Jul 07 11:03:50 2023 +0000
tree d5e9392eb05fab93b08b2556e9ae74e3f2689657
parent 2c0724413b9c610d5b8012372ca3b073af0498f1

Skip DebugPolicyHostTests if adb root fails

Bug: 290284438
Change-Id: Ie93a5702a4725851595b7c86669a89e4bfeae3d2
Test: T/H

tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java

diff --git a/tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java b/tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java
index 014f9f0..9cf28c7 100644
--- a/tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java
@@ -115,7 +115,7 @@
                 mAndroidDevice.supportsMicrodroid(/* protectedVm= */ true));
         assumeFalse("Test requires setprop for using custom pvmfw and adb root", isUserBuild());
 
-        mAndroidDevice.enableAdbRoot();
+        assumeTrue("Skip if adb root fails", mAndroidDevice.enableAdbRoot());
 
         // tradefed copies the test artfacts under /tmp when running tests,
         // so we should *find* the artifacts with the file name.