Move Cronet's MTS/CTS to external/cronet
* Cronet MTS / configuration changes continuously on each new import
that we do and coordinating two different repositories while doing an
import is unnecessarily added friction for which we wish to avoid.
Moving configuration to external/cronet will allow us to reduce test
divergence COMPLETELY which will make our import process easier.
* The code under test exists under `external/cronet` which makes sense
that the testing modules should live next to the code under test.
* Moved CTS tests to external/cronet as the code under test lives in
external/cronet.
Test: TH
Bug: 304217500
Bug: 338358650
Change-Id: I7537985f66ba36169219472cc268fe8fd5b3c58d
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d8d4c21..80af474 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -104,19 +104,6 @@
},
{
"name": "FrameworksNetIntegrationTests"
- },
- // Runs both NetHttpTests and CtsNetHttpTestCases
- {
- "name": "NetHttpCoverageTests",
- "options": [
- {
- "exclude-annotation": "com.android.testutils.SkipPresubmit"
- },
- {
- // These sometimes take longer than 1 min which is the presubmit timeout
- "exclude-annotation": "androidx.test.filters.LargeTest"
- }
- ]
}
],
"postsubmit": [
@@ -144,9 +131,6 @@
},
{
"name": "FrameworksNetTests"
- },
- {
- "name": "NetHttpCoverageTests"
}
],
"mainline-presubmit": [
@@ -273,18 +257,6 @@
"name": "libnetworkstats_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
},
{
- "name": "NetHttpCoverageTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
- "options": [
- {
- "exclude-annotation": "com.android.testutils.SkipPresubmit"
- },
- {
- // These sometimes take longer than 1 min which is the presubmit timeout
- "exclude-annotation": "androidx.test.filters.LargeTest"
- }
- ]
- },
- {
"name": "CtsTetheringTestLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"options": [
{
@@ -332,6 +304,9 @@
"path": "packages/modules/CaptivePortalLogin"
},
{
+ "path": "external/cronet"
+ },
+ {
"path": "vendor/xts/gts-tests/hostsidetests/networkstack"
}
]