Move FrameworksVpnTests to presubmit (ed85cfa4) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@
		"file_patterns": ["VcnManagementService\\.java"]
		},
		{
		"name": "FrameworksNetTests",
		"name": "FrameworksVpnTests",
		"options": [
		{
		"exclude-annotation": "com.android.testutils.SkipPresubmit"
		@@ -163,9 +163,6 @@
		}
		],
		"file_patterns": ["PinnerService\\.java"]
		},
		{
		"name": "FrameworksVpnTests"
		}
		]
		}

+13 −5

Original line number	Diff line number	Diff line
		@@ -8,6 +8,19 @@
		}
		],
		"file_patterns": ["VpnIkeV2Utils\\.java", "VpnProfileStore\\.java"]
		},
		{
		"name":"FrameworksVpnTests",
		"options": [
		{
		"exclude-annotation": "com.android.testutils.SkipPresubmit"
		}
		],
		"file_patterns":[
		"Vpn\\.java",
		"VpnIkeV2Utils\\.java",
		"VpnProfileStore\\.java"
		]
		}
		],
		"presubmit-large": [
		@@ -26,10 +39,5 @@
		],
		"file_patterns": ["Vpn\\.java", "VpnIkeV2Utils\\.java", "VpnProfileStore\\.java"]
		}
		],
		"postsubmit":[
		{
		"name":"FrameworksVpnTests"
		}
		]
		}
		No newline at end of file

+8 −4

Original line number	Diff line number	Diff line
		@@ -27,11 +27,15 @@
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "FrameworksVpnTests",
		"options": [
		{
		"exclude-annotation": "com.android.testutils.SkipPresubmit"
		}
		],
		"postsubmit":[
		{
		"name":"FrameworksVpnTests"
		"file_patterns": ["VpnManagerService\\.java"]
		}
		]
		}