diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-03-25 00:54:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-25 00:54:12 +0000 |
| commit | f1c33f832a626903c5fd7dc61a472685d7427c82 (patch) | |
| tree | de292a70ddc2edd6da37d3d9b370debd8b80b88f /aosp/dynamic_partition_control_android_unittest.cc | |
| parent | 3105e9a2cfe74258529d562215ff054ce39c33eb (diff) | |
| parent | 23fa108ac4b2020ba3a735b21d43719bd0300ae1 (diff) | |
Merge "Merge SP1A.210311.001 Change-Id: I30e3236e053ac82d0dda3608a864cfc107a05194" into s-keystone-qcom-dev
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; |