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

Commit 33634a02 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Do not install tethering in TEST_MAPPING 

The current tethering module has in-progress changes in non-mainline
branches, so it cannot be installed.
Disable the tests in non-mainline branches, considering that they are
still run in mainline branches, which will contain the same tethering
code, but without the connectivity artifacts added to the tethering
apex.

Bug: 177290955
Test: TEST_MAPPING needs to be tested on the infra
Ignore-AOSP-First: This change must not go into AOSP
Change-Id: I83243474f8e2f72d03ef68176053f9db793d127b
parent 33b06e3d

TEST_MAPPING

+6 −5
Original line number Diff line number Diff line
@@ -7,10 +7,11 @@ 
        { "name": "resolv_stats_test_utils_test" }

    ],

    "mainline-presubmit": [

        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" }

        // TODO: add back the tethering module when it is updatable in this branch

        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" }

    ]

}

resolv_test_config_template.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
<configuration description="Configuration for {MODULE} tests">

   <option name="test-suite-tag" value="mts" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />

   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

       <option name="cleanup" value="true" />

tests/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -214,7 +214,10 @@ cc_test { 
    ],

    defaults: ["netd_defaults", "resolv_test_defaults"],

    test_suites: ["general-tests"],

    test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],

    test_mainline_modules: [

        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex",

        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"

    ],

    static_libs: [

        "libgmock",

        "libprotobuf-cpp-lite",

tests/resolv_gold_test_config.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
<configuration description="Configuration for resolv gold tests">

   <option name="test-suite-tag" value="mts" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />

   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

       <option name="cleanup" value="true" />