commit 6099b4ac60c214526b77923761b532bdacc2a9a4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 28 08:34:02 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 28 08:34:02 2024 +0000
tree b600521a538a9c8a614f712a6c64d4fae5071e81
parent 5e6c369b3f73913494e5d76761a1d9dc094b604b
parent 167570ad4bfa48ad85993f150377efb385114e21

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

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

Change-Id: I8d31d323703a8c4f7dfaacfa06b05bdd7e837372
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 =