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

Commit a2aa83c5 authored by Akilesh Kailash's avatar Akilesh Kailash
Browse files

libsnapshot: don't kill the daemon for legacy vab snapshots 



If partitions are mounted off the daemon, there is no need
to kill if the tests are being run for legacy vab snapshots.

This also removes vabc_legacy_test as it is no longer required.

Bug: 331053511
Test: vab_legacy_test, vts_libsnapshot_test on Pixel - No flake observed
with 10 iterations
Change-Id: Ie8b29fef77948d23d920c19d816376290cf2fed9
Signed-off-by: default avatarAkilesh Kailash <akailash@google.com>
parent bc3476d5

fs_mgr/TEST_MAPPING

+0 −4
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
    {

      "name": "vab_legacy_tests"

    },

    // TODO(b/279009697):

    //{"name": "vabc_legacy_tests"},

    {

      "name": "cow_api_test"

    },
@@ -44,8 +42,6 @@ 
    {

      "name": "vab_legacy_tests"

    },

    // TODO(b/279009697):

    //{"name": "vabc_legacy_tests"}

    {

      "name": "snapuserd_test"

    }

fs_mgr/libsnapshot/snapshot_test.cpp

+13 −5
Original line number Diff line number Diff line
@@ -2883,7 +2883,16 @@ int main(int argc, char** argv) { 
    ::testing::AddGlobalTestEnvironment(new ::android::snapshot::SnapshotTestEnvironment());

    gflags::ParseCommandLineFlags(&argc, &argv, false);



    bool vab_legacy = false;

    if (FLAGS_force_mode == "vab-legacy") {

        vab_legacy = true;

    }



    if (!vab_legacy) {

        // This is necessary if the configuration we're testing doesn't match the device.

        android::base::SetProperty("ctl.stop", "snapuserd");

        android::snapshot::KillSnapuserd();

    }



    std::unordered_set<std::string> modes = {"", "vab-legacy"};

    if (modes.count(FLAGS_force_mode) == 0) {
@@ -2891,13 +2900,12 @@ int main(int argc, char** argv) { 
        return 1;

    }



    // This is necessary if the configuration we're testing doesn't match the device.

    android::snapshot::KillSnapuserd();



    int ret = RUN_ALL_TESTS();



    android::base::SetProperty("snapuserd.test.io_uring.force_disable", "0");



    if (!vab_legacy) {

        android::snapshot::KillSnapuserd();

    }

    return ret;

}