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

libsnapshot/test: Re-enable the failing tests

Browse source 
Some tests were temporarily disabled due to errors in Cuttlefish.
Now that the issues were fixed, the tests can be put back in presubmit.

Bug: 148889015
Test: vts_libsnapshot_test (Cuttlefish + Pixel 4)
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: Idcb2b7831b2183b2d734bdf8821fd34746f2beee
This commit is contained in:
Alessio Balsini 2020-02-26 21:49:25 +00:00
parent 7ef2b1d853
commit e7f1087fa1
3 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/TEST_MAPPING
View file

@ -13,7 +13,7 @@
"name": "fiemap_writer_test"
},
{
"name": "vts_libsnapshot_test_presubmit"
"name": "vts_libsnapshot_test"
}
]
}

8
fs_mgr/libsnapshot/Android.bp
View file

@ -208,14 +208,6 @@ cc_test {
defaults: ["libsnapshot_test_defaults"],
}
cc_test {
name: "vts_libsnapshot_test_presubmit",
defaults: ["libsnapshot_test_defaults"],
cppflags: [
"-DSKIP_TEST_IN_PRESUBMIT",
],
}
cc_binary {
name: "snapshotctl",
srcs: [

18
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -506,9 +506,6 @@ TEST_F(SnapshotTest, Merge) {
}
TEST_F(SnapshotTest, FirstStageMountAndMerge) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
ASSERT_TRUE(AcquireLock());
static const uint64_t kDeviceSize = 1024 * 1024;
@ -565,9 +562,6 @@ TEST_F(SnapshotTest, FlashSuperDuringUpdate) {
}
TEST_F(SnapshotTest, FlashSuperDuringMerge) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
ASSERT_TRUE(AcquireLock());
static const uint64_t kDeviceSize = 1024 * 1024;
@ -979,9 +973,6 @@ class SnapshotUpdateTest : public SnapshotTest {
// Also test UnmapUpdateSnapshot unmaps everything.
// Also test first stage mount and merge after this.
TEST_F(SnapshotUpdateTest, FullUpdateFlow) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
// OTA client blindly unmaps all partitions that are possibly mapped.
for (const auto& name : {"sys_b", "vnd_b", "prd_b"}) {
ASSERT_TRUE(sm->UnmapUpdateSnapshot(name));
@ -1129,9 +1120,6 @@ TEST_F(SnapshotUpdateTest, SnapshotStatusFileWithoutCow) {
// Test that the old partitions are not modified.
TEST_F(SnapshotUpdateTest, TestRollback) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
// Execute the update.
ASSERT_TRUE(sm->BeginUpdate());
ASSERT_TRUE(sm->UnmapUpdateSnapshot("sys_b"));
@ -1309,9 +1297,6 @@ TEST_F(SnapshotUpdateTest, RetrofitAfterRegularAb) {
}
TEST_F(SnapshotUpdateTest, MergeCannotRemoveCow) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
// Make source partitions as big as possible to force COW image to be created.
SetSize(sys_, 5_MiB);
SetSize(vnd_, 5_MiB);
@ -1586,9 +1571,6 @@ TEST_F(SnapshotUpdateTest, Overflow) {
}
TEST_F(SnapshotUpdateTest, WaitForMerge) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
AddOperationForPartitions();
// Execute the update.