Merge "Enable tests of u-boot instance image partitions" am: 2ad23e7bd7 am: 6b36da4c07
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2024643
Change-Id: I5a88646587a7e78209900690e5f5eb533429118a
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 8df853d..36bea72 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -544,8 +544,7 @@
.isNotEqualTo("vsoc_x86_64");
if (mProtectedVm) {
- // TODO(b/218461230): uncomment this after u-boot update
- // assertThatBootFailsAfterCompromisingPartition(U_BOOT_AVB_PARTITION_UUID);
+ assertThatBootFailsAfterCompromisingPartition(U_BOOT_AVB_PARTITION_UUID);
} else {
// non-protected VM shouldn't have u-boot avb data
assertThatPartitionIsMissing(U_BOOT_AVB_PARTITION_UUID);
@@ -560,8 +559,7 @@
.isNotEqualTo("vsoc_x86_64");
if (mProtectedVm) {
- // TODO(b/218461230): uncomment this after u-boot update
- // assertThatBootFailsAfterCompromisingPartition(U_BOOT_ENV_PARTITION_UUID);
+ assertThatBootFailsAfterCompromisingPartition(U_BOOT_ENV_PARTITION_UUID);
} else {
// non-protected VM shouldn't have u-boot env data
assertThatPartitionIsMissing(U_BOOT_ENV_PARTITION_UUID);