| commit | 6b36da4c07392100d9bc152c0fb8b842559a99f4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 15 00:52:23 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 15 00:52:23 2022 +0000 |
| tree | c04557f023bf1e1ec88a897f355efd201847f906 | |
| parent | 8e1acc91239ffa10f068e3d2797dc1a837d1a8d4 [diff] | |
| parent | 2ad23e7bd75e3d1b82781449074f36becdf19d74 [diff] |
Merge "Enable tests of u-boot instance image partitions" am: 2ad23e7bd7 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2024643 Change-Id: If8f74c831e70dc593d7497637723609c8ced2120
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);