diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-03-01 13:46:17 -0500 |
|---|---|---|
| committer | Kelvin Zhang <zhangkelvin@google.com> | 2021-03-02 19:38:51 -0500 |
| commit | 91ad6629e1c546091596bc5ac2da81fd312ccf99 (patch) | |
| tree | e76100b3ef6f86ad41397d552d5c3c5a8086093f /aosp/dynamic_partition_control_android_unittest.cc | |
| parent | b93055f15cf30fbb50107fdc3a55867c2487e141 (diff) | |
Fix incorrect mountable device path for VABC
Test: serve an OTA with postinstall, make sure postinstall works
Bug: 181182967
Change-Id: Ifd44bb700c4bca28a391c64fbc9888c79612f26f
Diffstat (limited to 'aosp/dynamic_partition_control_android_unittest.cc')
| -rw-r--r-- | aosp/dynamic_partition_control_android_unittest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/aosp/dynamic_partition_control_android_unittest.cc b/aosp/dynamic_partition_control_android_unittest.cc index 2f290d7c..4a12b830 100644 --- a/aosp/dynamic_partition_control_android_unittest.cc +++ b/aosp/dynamic_partition_control_android_unittest.cc @@ -472,7 +472,10 @@ TEST_P(DynamicPartitionControlAndroidTestP, GetMountableDevicePathVABC) { auto device_info = dynamicControl().GetPartitionDevice("system", target(), source(), false); ASSERT_TRUE(device_info.has_value()); - ASSERT_EQ(device_info->mountable_device_path, GetDevice(T("system"))); + base::FilePath vabc_device_dir{ + std::string{DynamicPartitionControlAndroid::VABC_DEVICE_DIR}}; + ASSERT_EQ(device_info->mountable_device_path, + vabc_device_dir.Append(T("system")).value()); } TEST_P(DynamicPartitionControlAndroidTestP, @@ -1102,7 +1105,8 @@ TEST_P(SnapshotPartitionTestP, RecoveryErrorShouldDeleteSource) { SetMetadata( source(), {{S("system"), 2_GiB}, {S("vendor"), 1_GiB}}, 0, super_size); ExpectUnmap({T("system"), T("vendor")}); - // Expect that the source partitions aren't present in target super metadata. + // Expect that the source partitions aren't present in target super + // metadata. ExpectStoreMetadata({{T("system"), 3_GiB}, {T("vendor"), 1_GiB}}); uint64_t required_size = 0; |