diff options
| author | Samip Garg <samgarg@google.com> | 2022-11-17 11:29:02 -0800 |
|---|---|---|
| committer | Samip Garg <samgarg@google.com> | 2022-12-08 18:09:40 +0000 |
| commit | fc0ee916bc236e1e748e9c67e68567ade4bd3e41 (patch) | |
| tree | c89a91a83f554d88f852b2c71edd57a39474cb73 | |
| parent | 0375a89f9ae9052a325b74f6eccdf4776567c36b (diff) | |
| parent | 9be0c7bbbc6b8b05d790a9ed23d98b9d35f1469a (diff) | |
| download | core-fc0ee916bc236e1e748e9c67e68567ade4bd3e41.tar.gz | |
Snap tm-dev to android13-tests-dev
Bug:259849956
Merge ab/9299233
Merged-In: I1795c931b28fd5fe28aa0f23717d4238fb352d37
Change-Id: I1fbab8fc336954dddd623a4a5724fa0e724b4f62
| -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(); |