LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore keepalive tests before S and without Tethering module

Browse Source 
The tests do not need to run on devices where the module is not updated
or updatable.

Tests that are not in presubmit were missed when annotating keepalive
tests in a previous change.

Change-Id: I11ef44987b5a9cbcdf5b892807f65c4f9d04812f
Test: atest
Fixes: 280131407
This commit is contained in:
Remi NGUYEN VAN
2023-05-02 07:18:56 +00:00
parent c745e52e04
commit 058431df27
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -1901,6 +1901,9 @@ public class ConnectivityManagerTest {
*/
@AppModeFull(reason = "Cannot get WifiManager in instant app mode")
@Test
// getSupportedKeepalives is available in updatable ConnectivityManager (S+)
// Also, this feature is not mainlined before S, and it's fine to skip on R- devices.
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@RequiresDevice // Keepalive is not supported on virtual hardware
public void testSocketKeepaliveLimitWifi() throws Exception {
assumeTrue(mPackageManager.hasSystemFeature(FEATURE_WIFI));
@@ -1951,6 +1954,9 @@ public class ConnectivityManagerTest {
*/
@AppModeFull(reason = "Cannot request network in instant app mode")
@Test
// getSupportedKeepalives is available in updatable ConnectivityManager (S+)
// Also, this feature is not mainlined before S, and it's fine to skip on R- devices.
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@RequiresDevice // Keepalive is not supported on virtual hardware
public void testSocketKeepaliveLimitTelephony() throws Exception {
if (!mPackageManager.hasSystemFeature(FEATURE_TELEPHONY)) {
@@ -1997,6 +2003,9 @@ public class ConnectivityManagerTest {
*/
@AppModeFull(reason = "Cannot get WifiManager in instant app mode")
@Test
// getSupportedKeepalives is available in updatable ConnectivityManager (S+)
// Also, this feature is not mainlined before S, and it's fine to skip on R- devices.
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@RequiresDevice // Keepalive is not supported on virtual hardware
public void testSocketKeepaliveUnprivileged() throws Exception {
assumeTrue(mPackageManager.hasSystemFeature(FEATURE_WIFI));