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

Merge "libsnapshot: Temporarily disable flaky ImageManagerTest"

Browse source
This commit is contained in:
Treehugger Robot 2020-02-18 17:43:00 +00:00 • committed by Gerrit Code Review
commit cf4f56df9f
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -1767,6 +1767,7 @@ class ImageManagerTest : public SnapshotTest, public WithParamInterface<uint64_t
protected: protected:
void SetUp() override { void SetUp() override {
if (!is_virtual_ab_) GTEST_SKIP() << "Test for Virtual A/B devices only"; if (!is_virtual_ab_) GTEST_SKIP() << "Test for Virtual A/B devices only";
GTEST_SKIP() << "WIP failure b/149738928";
SnapshotTest::SetUp(); SnapshotTest::SetUp();
userdata_ = std::make_unique<LowSpaceUserdata>(); userdata_ = std::make_unique<LowSpaceUserdata>();
@ -1774,6 +1775,7 @@ class ImageManagerTest : public SnapshotTest, public WithParamInterface<uint64_t
} }
void TearDown() override { void TearDown() override {
if (!is_virtual_ab_) return; if (!is_virtual_ab_) return;
return; // BUG(149738928)
EXPECT_TRUE(!image_manager_->BackingImageExists(kImageName) || EXPECT_TRUE(!image_manager_->BackingImageExists(kImageName) ||
image_manager_->DeleteBackingImage(kImageName)); image_manager_->DeleteBackingImage(kImageName));
@ -1808,10 +1810,6 @@ std::vector<uint64_t> ImageManagerTestParams() {
std::vector<uint64_t> ret; std::vector<uint64_t> ret;
for (uint64_t size = 1_MiB; size <= 512_MiB; size *= 2) { for (uint64_t size = 1_MiB; size <= 512_MiB; size *= 2) {
ret.push_back(size); ret.push_back(size);
#ifdef SKIP_TEST_IN_PRESUBMIT
// BUG(148889015);
break;
#endif
} }
return ret; return ret;
} }