pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix skipping testBootEnableAndDisablePKVM"

This commit is contained in:
Treehugger Robot 2022-09-06 16:01:00 +00:00 committed by Gerrit Code Review
parent a70d991edd bcfa535417
commit 8487f47d2d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
View File

@ -86,7 +86,7 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
@Test @Test
public void testBootEnableAndDisablePKVM() throws Exception { public void testBootEnableAndDisablePKVM() throws Exception {
testPKVMStatusSwitchSupported(); skipIfPKVMStatusSwitchNotSupported();
List<Double> bootWithPKVMEnableTime = new ArrayList<>(ROUND_COUNT); List<Double> bootWithPKVMEnableTime = new ArrayList<>(ROUND_COUNT);
List<Double> bootWithoutPKVMEnableTime = new ArrayList<>(ROUND_COUNT); List<Double> bootWithoutPKVMEnableTime = new ArrayList<>(ROUND_COUNT);
@ -149,7 +149,7 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
reportMetric(bootWithoutCompOsTime, "boot_time_without_compos", "s"); reportMetric(bootWithoutCompOsTime, "boot_time_without_compos", "s");
} }
private void testPKVMStatusSwitchSupported() throws Exception { private void skipIfPKVMStatusSwitchNotSupported() throws Exception {
if (!getDevice().isStateBootloaderOrFastbootd()) { if (!getDevice().isStateBootloaderOrFastbootd()) {
getDevice().rebootIntoBootloader(); getDevice().rebootIntoBootloader();
} }
@ -159,6 +159,9 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
result = getDevice().executeFastbootCommand("oem", "pkvm", "status"); result = getDevice().executeFastbootCommand("oem", "pkvm", "status");
rebootFromBootloaderAndWaitBootCompleted(); rebootFromBootloaderAndWaitBootCompleted();
assumeTrue(!result.getStderr().contains("Invalid oem command")); assumeTrue(!result.getStderr().contains("Invalid oem command"));
// Skip the test if running on a build with pkvm_enabler. Disabling pKVM
// for such builds results in a bootloop.
assumeTrue(result.getStdout().contains("misc=auto"));
} }
private void reportMetric(List<Double> data, String name, String unit) { private void reportMetric(List<Double> data, String name, String unit) {
@ -195,11 +198,6 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
} }
assertWithMessage("Failed to set PKVM status. Reason: " + result) assertWithMessage("Failed to set PKVM status. Reason: " + result)
.that(result.toString()).ignoringCase().contains(expectedOutput); .that(result.toString()).ignoringCase().contains(expectedOutput);
// Skip the test if running on a build with pkvm_enabler. Disabling
// pKVM for such build results in a bootloop.
assertWithMessage("Expected build with PKVM status misc=auto. Reason: " + result)
.that(result.toString()).ignoringCase().contains("misc=auto");
} }
private void rebootFromBootloaderAndWaitBootCompleted() throws Exception { private void rebootFromBootloaderAndWaitBootCompleted() throws Exception {