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

Commit 118a97fb authored by Samip Garg's avatar Samip Garg Committed by Automerger Merge Worker
Browse files

Snap tm-dev to android13-tests-dev am: fc0ee916 

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



Change-Id: Ia96976f302e1bd3d2ffbf2740010e40f4692d12e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf458bae fc0ee916

fs_mgr/libsnapshot/snapshot_test.cpp

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

    }

    void TearDown() override {

    void TearDown() override {

        RETURN_IF_NON_VIRTUAL_AB();

        RETURN_IF_NON_VIRTUAL_AB();

        return;  // BUG(149738928)





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

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

                    image_manager_->DeleteBackingImage(kImageName));

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

    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) {

TEST_P(ImageManagerTest, CreateImageNoSpace) {

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

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

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

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

fs_mgr/libsnapshot/vts_ota_config_test.cpp

100644 → 100755
+3 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,9 @@ static int GetVsrLevel() { 
}

}





TEST(VAB, Enabled) {

TEST(VAB, Enabled) {

    if (!android::base::GetBoolProperty("ro.build.ab_update", false) && (GetVsrLevel() < __ANDROID_API_T__)) {

        GTEST_SKIP();

    }

    ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false));

    ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false));

    if (GetVsrLevel() < __ANDROID_API_T__) {

    if (GetVsrLevel() < __ANDROID_API_T__) {

        GTEST_SKIP();

        GTEST_SKIP();