diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-17 00:34:12 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-17 00:34:12 +0000 |
| commit | 913a39474166ae0bdc834a3f0c33b880a49d6f3a (patch) | |
| tree | 812e9e1114855b960d84a5906b101d886a2c8b56 | |
| parent | 44526abc1101203b35c5a22864362045f95bb6fc (diff) | |
| parent | d7918fad814123e2f6cab6d77bf16826d323de2c (diff) | |
| download | core-913a39474166ae0bdc834a3f0c33b880a49d6f3a.tar.gz | |
Snap for 9495226 from d7918fad814123e2f6cab6d77bf16826d323de2c to tm-qpr3-release
Change-Id: I2f9c937d3bc172763e15e19ab4bcba294cbe72ea
| -rw-r--r-- | fs_mgr/libsnapshot/snapshot_test.cpp | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | fs_mgr/libsnapshot/vts_ota_config_test.cpp | 3 |
2 files changed, 3 insertions, 14 deletions
diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp index c145da718..e7ffb1600 100644 --- a/fs_mgr/libsnapshot/snapshot_test.cpp +++ b/fs_mgr/libsnapshot/snapshot_test.cpp @@ -2609,7 +2609,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)); @@ -2618,19 +2617,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, diff --git a/fs_mgr/libsnapshot/vts_ota_config_test.cpp b/fs_mgr/libsnapshot/vts_ota_config_test.cpp index 02bcc3438..d387eb32d 100644..100755 --- a/fs_mgr/libsnapshot/vts_ota_config_test.cpp +++ b/fs_mgr/libsnapshot/vts_ota_config_test.cpp @@ -22,6 +22,9 @@ static int GetVsrLevel() { } 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)); if (GetVsrLevel() < __ANDROID_API_T__) { GTEST_SKIP(); |