1 files changed, 16 insertions, 4 deletions
diff --git a/aosp/dynamic_partition_control_android_unittest.cc b/aosp/dynamic_partition_control_android_unittest.cc
index 2f290d7c..0bb8df7a 100644
--- a/aosp/dynamic_partition_control_android_unittest.cc
+++ b/aosp/dynamic_partition_control_android_unittest.cc
@@ -402,7 +402,8 @@ TEST_P(DynamicPartitionControlAndroidTestP, GetMountableDevicePath) {
       .WillByDefault(Return(FeatureFlag(FeatureFlag::Value::NONE)));
   ON_CALL(dynamicControl(), UpdateUsesSnapshotCompression())
       .WillByDefault(Return(false));
-  ON_CALL(dynamicControl(), IsDynamicPartition(_)).WillByDefault(Return(true));
+  ON_CALL(dynamicControl(), IsDynamicPartition(_, _))
+      .WillByDefault(Return(true));
 
   EXPECT_CALL(dynamicControl(),
               DeviceExists(AnyOf(GetDevice(S("vendor")),
@@ -442,7 +443,7 @@ TEST_P(DynamicPartitionControlAndroidTestP, GetMountableDevicePathVABC) {
       .WillByDefault(Return(FeatureFlag(FeatureFlag::Value::LAUNCH)));
   ON_CALL(dynamicControl(), UpdateUsesSnapshotCompression())
       .WillByDefault(Return(true));
-  EXPECT_CALL(dynamicControl(), IsDynamicPartition(_))
+  EXPECT_CALL(dynamicControl(), IsDynamicPartition(_, _))
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
 
@@ -472,7 +473,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,
@@ -1047,6 +1051,7 @@ class SnapshotPartitionTestP : public DynamicPartitionControlAndroidTestP {
 // Test happy path of PreparePartitionsForUpdate on a Virtual A/B device.
 TEST_P(SnapshotPartitionTestP, PreparePartitions) {
   ExpectCreateUpdateSnapshots(android::snapshot::Return::Ok());
+  SetMetadata(source(), {});
   uint64_t required_size = 0;
   EXPECT_TRUE(PreparePartitionsForUpdate(&required_size));
   EXPECT_EQ(0u, required_size);
@@ -1057,6 +1062,8 @@ TEST_P(SnapshotPartitionTestP, PreparePartitions) {
 TEST_P(SnapshotPartitionTestP, PreparePartitionsNoSpace) {
   ExpectCreateUpdateSnapshots(android::snapshot::Return::NoSpace(1_GiB));
   uint64_t required_size = 0;
+
+  SetMetadata(source(), {});
   EXPECT_FALSE(PreparePartitionsForUpdate(&required_size));
   EXPECT_EQ(1_GiB, required_size);
 }
@@ -1066,6 +1073,10 @@ TEST_P(SnapshotPartitionTestP, PreparePartitionsNoSpace) {
 TEST_P(SnapshotPartitionTestP, RecoveryUseSuperEmpty) {
   ExpectCreateUpdateSnapshots(android::snapshot::Return::Ok());
   EXPECT_CALL(dynamicControl(), IsRecovery()).WillRepeatedly(Return(true));
+
+  // Metadata is needed to perform super partition size check.
+  SetMetadata(source(), {});
+
   // Must not call PrepareDynamicPartitionsForUpdate if
   // PrepareSnapshotPartitionsForUpdate succeeds.
   EXPECT_CALL(dynamicControl(), PrepareDynamicPartitionsForUpdate(_, _, _, _))
@@ -1102,7 +1113,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;