Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a57bed4e authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Remove flaky image creation test." am: 4f351c3c am:... 

Merge "libsnapshot: Remove flaky image creation test." am: 4f351c3c am: 7fec391e am: 9c8bb1fc am: 6ce00bbd am: 5982f036

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2184641



Change-Id: I1676bdeab7acc5c2907c31517dc9ccf1f2896ede
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93a7b8e4 5982f036

fs_mgr/libsnapshot/snapshot_test.cpp

+0 −14
Original line number Diff line number Diff line
@@ -2660,7 +2660,6 @@ class ImageManagerTest : public SnapshotTest, public WithParamInterface<uint64_t 
    }

    void TearDown() override {

        RETURN_IF_NON_VIRTUAL_AB();

        return;  // BUG(149738928)



        EXPECT_TRUE(!image_manager_->BackingImageExists(kImageName) ||

                    image_manager_->DeleteBackingImage(kImageName));
@@ -2669,19 +2668,6 @@ class ImageManagerTest : public SnapshotTest, public WithParamInterface<uint64_t 
    std::unique_ptr<LowSpaceUserdata> userdata_;

};



TEST_P(ImageManagerTest, CreateImageEnoughAvailSpace) {

    if (userdata_->available_space() == 0) {

        GTEST_SKIP() << "/data is full (" << userdata_->available_space()

                     << " bytes available), skipping";

    }

    ASSERT_TRUE(image_manager_->CreateBackingImage(kImageName, userdata_->available_space(),

                                                   IImageManager::CREATE_IMAGE_DEFAULT))

            << "Should be able to create image with size = " << userdata_->available_space()

            << " bytes";

    ASSERT_TRUE(image_manager_->DeleteBackingImage(kImageName))

            << "Should be able to delete created image";

}



TEST_P(ImageManagerTest, CreateImageNoSpace) {

    uint64_t to_allocate = userdata_->free_space() + userdata_->bsize();

    auto res = image_manager_->CreateBackingImage(kImageName, to_allocate,