| commit | 3eb8ff10fadaee830d01cfe84c25ff247567d762 | [log] [tgz] |
|---|---|---|
| author | Shikha Panwar <shikhapanwar@google.com> | Mon Mar 24 09:40:24 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 24 09:40:24 2025 -0700 |
| tree | 6f1cc35b443e81cb65190123300945dcb5954ba1 | |
| parent | 3ed1004f16f7a46cf4320230dfd7d120a92c1485 [diff] | |
| parent | 86d30736b86f9d1584785c6b7c0b5d861500daac [diff] |
Merge "Ensure check-feature-enabled actually succeeds" into main am: 86d30736b8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3537504 Change-Id: I561f9e7686bb079688ba2c0a1be9732400209c01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java index 7eb7748..7c1091d 100644 --- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java +++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -230,8 +230,12 @@ public boolean isFeatureEnabled(String feature) throws Exception { CommandRunner android = new CommandRunner(getDevice()); - String result = android.run(VIRT_APEX + "bin/vm", "check-feature-enabled", feature); - return result.contains("enabled"); + String cmd = VIRT_APEX + "bin/vm check-feature-enabled " + feature; + CommandResult result = android.runForResult(cmd); + assumeTrue( + "Failed to run" + cmd + " " + result, + result.getStatus() == CommandStatus.SUCCESS && result.getExitCode() == 0); + return result.getStdout().trim().contains("Feature " + feature + " is enabled"); } public List<AssignableDevice> getAssignableDevices() throws Exception {