commit 3e00a79b7c486137dc2c58dd4aeb71f6673a755e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 28 08:43:23 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 28 08:43:23 2024 +0000
tree a15ecd5ffce8196991b5c269ff14f747b1e6dd27
parent 44a44c8980dad96aaefd11b81bdfcd684b08db80
parent 6099b4ac60c214526b77923761b532bdacc2a9a4

Merge "[vsr-test] Relax the pVM DICE chain verification test" into main am: 167570ad4b am: 6099b4ac60

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3244360

Change-Id: Ia3a50f9fad0ee6b6588cdc72d90c64a26e81cd1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java

diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 7089b33..f21e18e 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -1305,7 +1305,7 @@
     }
 
     @Test
-    @VsrTest(requirements = {"VSR-7.1-001.005"})
+    @VsrTest(requirements = {"VSR-7.1-001.004"})
     public void protectedVmHasValidDiceChain() throws Exception {
         // This test validates two things regarding the pVM DICE chain:
         // 1. The DICE chain is well-formed that all the entries conform to the DICE spec.
@@ -1313,7 +1313,7 @@
         assumeSupportedDevice();
         assumeProtectedVM();
         assumeVsrCompliant();
-        assumeTrue("Vendor API must be at least 202404", getVendorApiLevel() >= 202404);
+        assumeTrue("Vendor API must be newer than 202404", getVendorApiLevel() > 202404);
 
         grantPermission(VirtualMachine.USE_CUSTOM_VIRTUAL_MACHINE_PERMISSION);
         VirtualMachineConfig config =