72bc600be2
The untrusted apps should not directly access /dev/socket/mdnsd since Android U(SDK 34). For untrusted apps built with target SDK 33 or less, it should still be able to access the mdnsd socket. Fix the mts test suits from mts-networking to mts-tethering. If the test suits is marked as mts-networking, it would run in NetworkStack MTS, which isn't really what is tested in the tests. Test: atest CtsNetTestCases CtsNetTestCasesMaxTargetSdk33 Bug: 267102290 Change-Id: I851c181fa7489115fb1f335a369830078f5a5c14
243 lines
7.3 KiB
Plaintext
243 lines
7.3 KiB
Plaintext
{
|
|
"presubmit": [
|
|
{
|
|
"name": "ConnectivityCoverageTests"
|
|
},
|
|
{
|
|
// In addition to ConnectivityCoverageTests, runs non-connectivity-module tests
|
|
"name": "FrameworksNetTests"
|
|
},
|
|
// Run in addition to mainline-presubmit as mainline-presubmit is not
|
|
// supported in every branch.
|
|
// CtsNetTestCasesLatestSdk uses stable API shims, so does not exercise
|
|
// some latest APIs. Run CtsNetTestCases to get coverage of newer APIs.
|
|
{
|
|
"name": "CtsNetTestCases",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
// Also run CtsNetTestCasesLatestSdk to ensure tests using older shims pass.
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
// CTS tests that target older SDKs.
|
|
{
|
|
"name": "CtsNetTestCasesMaxTargetSdk30",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "CtsNetTestCasesMaxTargetSdk31",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "CtsNetTestCasesMaxTargetSdk33",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "bpf_existence_test"
|
|
},
|
|
{
|
|
"name": "connectivity_native_test"
|
|
},
|
|
{
|
|
"name": "CtsNetHttpTestCases"
|
|
},
|
|
{
|
|
"name": "libclat_test"
|
|
},
|
|
{
|
|
"name": "netd_updatable_unit_test"
|
|
},
|
|
{
|
|
"name": "TetheringTests"
|
|
},
|
|
{
|
|
"name": "TetheringIntegrationTests"
|
|
},
|
|
{
|
|
"name": "traffic_controller_unit_test"
|
|
},
|
|
{
|
|
"name": "libnetworkstats_test"
|
|
},
|
|
{
|
|
"name": "FrameworksNetIntegrationTests"
|
|
}
|
|
],
|
|
"postsubmit": [
|
|
{
|
|
"name": "TetheringPrivilegedTests"
|
|
},
|
|
{
|
|
"name": "netd_updatable_unit_test",
|
|
"keywords": ["netd-device-kernel-4.9", "netd-device-kernel-4.14"]
|
|
},
|
|
{
|
|
"name": "traffic_controller_unit_test",
|
|
"keywords": ["netd-device-kernel-4.9", "netd-device-kernel-4.14"]
|
|
},
|
|
{
|
|
"name": "FrameworksNetDeflakeTest"
|
|
},
|
|
// Run in postsubmit to confirm test passes continously since this is a new test setup
|
|
// TODO: move tests to presubmit
|
|
{
|
|
"name": "NetHttpTests"
|
|
}
|
|
],
|
|
"mainline-presubmit": [
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "CtsNetTestCasesMaxTargetSdk30[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "CtsNetTestCasesMaxTargetSdk31[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "CtsNetTestCasesMaxTargetSdk33[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
// Test with APK modules only, in cases where APEX is not supported, or the other modules
|
|
// were simply not updated
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk]",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
},
|
|
{
|
|
"exclude-annotation": "com.android.testutils.ConnectivityModuleTest"
|
|
}
|
|
]
|
|
},
|
|
// Test with connectivity/tethering module only, to catch integration issues with older versions
|
|
// of other modules. "new tethering + old NetworkStack" is not a configuration that should
|
|
// really exist in the field, but there is no strong guarantee, and it is required by MTS
|
|
// testing for module qualification, where modules are tested independently.
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk[com.google.android.tethering.apex]",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "bpf_existence_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
},
|
|
{
|
|
"name": "connectivity_native_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
},
|
|
{
|
|
"name": "netd_updatable_unit_test[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]"
|
|
},
|
|
{
|
|
"name": "traffic_controller_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
},
|
|
{
|
|
"name": "libnetworkstats_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
}
|
|
],
|
|
"mainline-postsubmit": [
|
|
// Tests on physical devices with SIM cards: postsubmit only for capacity constraints
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"keywords": ["sim"]
|
|
}
|
|
],
|
|
"imports": [
|
|
{
|
|
"path": "frameworks/base/core/java/android/net"
|
|
},
|
|
{
|
|
"path": "frameworks/opt/net/ethernet"
|
|
},
|
|
{
|
|
"path": "packages/modules/NetworkStack"
|
|
},
|
|
{
|
|
"path": "packages/modules/CaptivePortalLogin"
|
|
},
|
|
{
|
|
"path": "vendor/xts/gts-tests/hostsidetests/networkstack"
|
|
}
|
|
]
|
|
}
|