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

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

Skip tests if vendor partition is on Android S 



Bug: 349278999
Test: vts_libsnapshot_test on GSI config
Change-Id: I6826b287565e8a78bea21b4830ad30f1c30a01bf
Signed-off-by: default avatarAkilesh Kailash <akailash@google.com>
parent 1b76cb48

fs_mgr/libsnapshot/include_test/libsnapshot/test_helpers.h

+18 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <storage_literals/storage_literals.h>

#include <update_engine/update_metadata.pb.h>



#include "utility.h"



namespace android {

namespace snapshot {
@@ -234,5 +236,21 @@ bool IsVirtualAbEnabled(); 


#define RETURN_IF_NON_VIRTUAL_AB() RETURN_IF_NON_VIRTUAL_AB_MSG("")



#define SKIP_IF_VENDOR_ON_ANDROID_S()                                        \

    do {                                                                     \

        if (IsVendorFromAndroid12())                                         \

            GTEST_SKIP() << "Skip test as Vendor partition is on Android S"; \

    } while (0)



#define RETURN_IF_VENDOR_ON_ANDROID_S_MSG(msg) \

    do {                                       \

        if (IsVendorFromAndroid12()) {         \

            std::cerr << (msg);                \

            return;                            \

        }                                      \

    } while (0)



#define RETURN_IF_VENDOR_ON_ANDROID_S() RETURN_IF_VENDOR_ON_ANDROID_S_MSG("")



}  // namespace snapshot

}  // namespace android

fs_mgr/libsnapshot/snapshot_test.cpp

+7 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ class SnapshotTest : public ::testing::Test { 
        LOG(INFO) << "Starting test: " << test_name_;



        SKIP_IF_NON_VIRTUAL_AB();

        SKIP_IF_VENDOR_ON_ANDROID_S();



        SetupProperties();

        if (!DeviceSupportsMode()) {
@@ -168,6 +169,7 @@ class SnapshotTest : public ::testing::Test { 


    void TearDown() override {

        RETURN_IF_NON_VIRTUAL_AB();

        RETURN_IF_VENDOR_ON_ANDROID_S();



        LOG(INFO) << "Tearing down SnapshotTest test: " << test_name_;
@@ -1015,6 +1017,7 @@ class SnapshotUpdateTest : public SnapshotTest { 
  public:

    void SetUp() override {

        SKIP_IF_NON_VIRTUAL_AB();

        SKIP_IF_VENDOR_ON_ANDROID_S();



        SnapshotTest::SetUp();

        if (!image_manager_) {
@@ -1097,6 +1100,7 @@ class SnapshotUpdateTest : public SnapshotTest { 
    }

    void TearDown() override {

        RETURN_IF_NON_VIRTUAL_AB();

        RETURN_IF_VENDOR_ON_ANDROID_S();



        LOG(INFO) << "Tearing down SnapshotUpdateTest test: " << test_name_;
@@ -2833,6 +2837,7 @@ void SnapshotTestEnvironment::SetUp() { 
    // that is fixed, don't call GTEST_SKIP here, but instead call GTEST_SKIP in individual test

    // suites.

    RETURN_IF_NON_VIRTUAL_AB_MSG("Virtual A/B is not enabled, skipping global setup.\n");

    RETURN_IF_VENDOR_ON_ANDROID_S_MSG("Test not enabled for Vendor on Android S.\n");



    std::vector<std::string> paths = {

            // clang-format off
@@ -2887,6 +2892,8 @@ void SnapshotTestEnvironment::SetUp() { 


void SnapshotTestEnvironment::TearDown() {

    RETURN_IF_NON_VIRTUAL_AB();

    RETURN_IF_VENDOR_ON_ANDROID_S();



    if (super_images_ != nullptr) {

        DeleteBackingImage(super_images_.get(), "fake-super");

    }