ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes Ifc76203e,I194d15cf

Browse source 
* changes:
  libsnapshot: Fix DataWipeRollbackInRecovery test
  libsnapshot: Fix test MergeInRecovery
This commit is contained in:
Yifan Hong 2019-11-27 18:43:16 +00:00 • committed by Gerrit Code Review
commit 217e10e3d4
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -71,6 +71,8 @@ std::unique_ptr<SnapshotManager> sm;
TestDeviceInfo* test_device = nullptr;
std::string fake_super;
void MountMetadata();
class SnapshotTest : public ::testing::Test {
public:
SnapshotTest() : dm_(DeviceMapper::Instance()) {}
@ -87,7 +89,7 @@ class SnapshotTest : public ::testing::Test {
InitializeState();
CleanupTestArtifacts();
FormatFakeSuper();
MountMetadata();
ASSERT_TRUE(sm->BeginUpdate());
}
@ -662,6 +664,7 @@ class SnapshotUpdateTest : public SnapshotTest {
if (!image_manager_) {
InitializeState();
}
MountMetadata();
for (const auto& suffix : {"_a", "_b"}) {
test_device->set_slot_suffix(suffix);
EXPECT_TRUE(sm->CancelUpdate()) << suffix;
@ -1206,6 +1209,10 @@ class MetadataMountedTest : public SnapshotUpdateTest {
Fstab fstab_;
};
void MountMetadata() {
MetadataMountedTest().TearDown();
}
TEST_F(MetadataMountedTest, Android) {
auto device = sm->EnsureMetadataMounted();
EXPECT_NE(nullptr, device);
@ -1277,6 +1284,8 @@ TEST_F(SnapshotUpdateTest, DataWipeRollbackInRecovery) {
auto new_sm = SnapshotManager::NewForFirstStageMount(test_device);
ASSERT_TRUE(new_sm->HandleImminentDataWipe());
// Manually mount metadata so that we can call GetUpdateState() below.
MountMetadata();
EXPECT_EQ(new_sm->GetUpdateState(), UpdateState::Unverified);
EXPECT_TRUE(test_device->IsSlotUnbootable(1));
EXPECT_FALSE(test_device->IsSlotUnbootable(0));