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

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

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

Merged-In: I1795c931b28fd5fe28aa0f23717d4238fb352d37
Change-Id: I3a87ba88e502cdc65e51573848075d95a5f04c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Samip Garg 2023-01-10 21:03:26 +00:00 • committed by Xin Li
commit c392840ee1
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -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,

3
fs_mgr/libsnapshot/vts_ota_config_test.cpp Normal file → Executable file
View file

@ -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();