Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ceecfe authored by Alessio Balsini's avatar Alessio Balsini Committed by Yifan Hong
Browse files

libsnapshot/test: Re-enable the failing tests 



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: default avatarAlessio Balsini <balsini@google.com>
Change-Id: Idcb2b7831b2183b2d734bdf8821fd34746f2beee
Merged-In: Idcb2b7831b2183b2d734bdf8821fd34746f2beee
parent 694529d3

fs_mgr/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
      "name": "fiemap_writer_test"

    },

    {

      "name": "vts_libsnapshot_test_presubmit"

      "name": "vts_libsnapshot_test"

    }

  ]

}

fs_mgr/libsnapshot/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -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: [

fs_mgr/libsnapshot/snapshot_test.cpp

+0 −18
Original line number Diff line number Diff line
@@ -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.