commit 3e7ae5006c069f21838c0a18c9fa8dd654aef7df
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 25 13:46:36 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 25 13:46:36 2024 +0000
tree ab08e0ab7e5b498242fd4baf2497b6baa7393cd9
parent 893526e4938c980be1298d694ea6f432e3149c91
parent 3f4dfcbc1ae9c0f22f101df68e5a93b5a5285245

Merge "MicrodroidHostTests: Decorate CDD 9.17/C-2-5 tests" into main am: 3f4dfcbc1a

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

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

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

diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
index 3a76328..5cb63b0 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -506,7 +506,7 @@
     }
 
     @Test
-    @CddTest(requirements = {"9.17/C-2-1", "9.17/C-2-2", "9.17/C-2-6"})
+    @CddTest(requirements = {"9.17/C-2-1", "9.17/C-2-2", "9.17/C-2-5", "9.17/C-2-6"})
     public void protectedVmWithImageSignedWithDifferentKeyFailsToVerifyPayload() throws Exception {
         // Arrange
         assumeProtectedVm();
@@ -551,7 +551,7 @@
     }
 
     @Test
-    @CddTest(requirements = {"9.17/C-2-2", "9.17/C-2-6"})
+    @CddTest(requirements = {"9.17/C-2-2", "9.17/C-2-5", "9.17/C-2-6"})
     public void testBootFailsWhenVbMetaDigestDoesNotMatchBootconfig() throws Exception {
         // protectedVmWithImageSignedWithDifferentKeyRunsPvmfw() is the protected case.
         assumeNonProtectedVm();