Revert^2 "Remove UBoot related Microdroid tests"
Since we are removing the (u-boot) based bootloader, test
bootFailsWhenUBootAvbDataIsCompromised is obsolete. Remove it.
This reverts commit 6951dddfccd51cc298e44334760498f3286f8e5a
Test: N/A
Bug: 240235424
Change-Id: I46f1f2ef52acd81a781f405281a44d2b31416b5d
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 c2060cb..4b40293 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -451,36 +451,6 @@
"9.17/C-1-1",
"9.17/C-2-7"
})
- public void bootFailsWhenUBootAvbDataIsCompromised()
- throws VirtualMachineException, InterruptedException, IOException {
- if (mProtectedVm) {
- assertThatBootFailsAfterCompromisingPartition(U_BOOT_AVB_PARTITION_UUID);
- } else {
- // non-protected VM shouldn't have u-boot avb data
- assertThatPartitionIsMissing(U_BOOT_AVB_PARTITION_UUID);
- }
- }
-
- @Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-2-7"
- })
- public void bootFailsWhenUBootEnvDataIsCompromised()
- throws VirtualMachineException, InterruptedException, IOException {
- if (mProtectedVm) {
- assertThatBootFailsAfterCompromisingPartition(U_BOOT_ENV_PARTITION_UUID);
- } else {
- // non-protected VM shouldn't have u-boot env data
- assertThatPartitionIsMissing(U_BOOT_ENV_PARTITION_UUID);
- }
- }
-
- @Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-2-7"
- })
public void bootFailsWhenPvmFwDataIsCompromised()
throws VirtualMachineException, InterruptedException, IOException {
if (mProtectedVm) {