From 1c45a8a623971723f0feceff949ff92eae893bed Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Thu, 24 Jun 2021 06:44:48 +0000
Subject: [PATCH] Add ConnectivityCoverageTests to postsubmit

Add the tests to both postsubmit and mainline-postsubmit.

This should allow moving the tests to presubmit in the near future,
after they have been verified to pass in postsubmit.

Bug: 187935317
Test: treehugger needs to test
Original-Change: https://android-review.googlesource.com/1736506
Merged-In: I9a05d6a300c5f777497e867d0456bc59b06eee80
Change-Id: I9a05d6a300c5f777497e867d0456bc59b06eee80
---
 TEST_MAPPING            | 8 ++++++++
 tests/common/Android.bp | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 566e8e10f1..465f7277e6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -19,6 +19,11 @@
       "name": "TetheringIntegrationTests"
     }
   ],
+  "postsubmit": [
+    {
+      "name": "ConnectivityCoverageTests"
+    }
+  ],
   "mainline-presubmit": [
     {
       // TODO: add back the tethering modules when updatable in this branch
@@ -38,6 +43,9 @@
     },
     {
       "name": "TetheringCoverageTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
+    },
+    {
+      "name": "ConnectivityCoverageTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
     }
   ],
   "imports": [
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index 28339f116d..515c00ca6f 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -50,6 +50,9 @@ android_test {
     // TODO: change to 31 as soon as it is available
     target_sdk_version: "30",
     test_suites: ["device-tests", "mts"],
+    test_mainline_modules: [
+        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex",
+    ],
     defaults: [
         "framework-connectivity-test-defaults",
         "FrameworksNetTests-jni-defaults",