commit 31d229db384eede098e6e502b4d8bea031fa064a
author Chiachang Wang <chiachangwang@google.com> Tue Aug 22 09:08:21 2023 +0000
committer Chiachang Wang <chiachangwang@google.com> Mon Aug 28 08:47:07 2023 +0000
tree 9a32c1785016b9d5eecc4817dc0c6ed2dd24c187
parent 1065540ad3611ae8b8f4d27a5fb2441d1609b747

Add VPN UT and CTS into presubmit

Changes in VpnManagerService does not trigger VPN UT and CTS
in presubmit. It will introduce unexpected test failure if
the commit is not well-tested.

Bug: 286302640
Test: m
Change-Id: Ia608a96ff721239870b2334b7d9f63f54c4300ea

services/core/java/com/android/server/TEST_MAPPING

diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING
index 4b00aca..ada63c6 100644
--- a/services/core/java/com/android/server/TEST_MAPPING
+++ b/services/core/java/com/android/server/TEST_MAPPING
@@ -61,6 +61,15 @@
         {
             "name": "CtsVcnTestCases",
             "file_patterns": ["VcnManagementService\\.java"]
+        },
+        {
+            "name": "FrameworksNetTests",
+            "options": [
+                {
+                    "exclude-annotation": "com.android.testutils.SkipPresubmit"
+                }
+            ],
+            "file_patterns": ["VpnManagerService\\.java"]
         }
     ],
     "presubmit-large": [
@@ -78,6 +87,21 @@
                 }
             ],
             "file_patterns": ["ClipboardService\\.java"]
+        },
+        {
+            "name": "CtsHostsideNetworkTests",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                },
+                {
+                    "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+                },
+                {
+                    "exclude-annotation": "com.android.testutils.SkipPresubmit"
+                }
+            ],
+            "file_patterns": ["VpnManagerService\\.java"]
         }
     ],
     "postsubmit": [