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

Merge "Add proper kernel support assumption to RateLimitTest"

Browse Source
This commit is contained in:
Patrick Rohr
2022-02-22 20:43:22 +00:00
committed by Gerrit Code Review
parent b30e957777 2140575fce
commit 3dd5cc1631
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/cts/net/src/android/net/cts/RateLimitTest.java
View File

@@ -28,7 +28,9 @@ import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static com.android.testutils.TestPermissionUtil.runAsShell; import static com.android.testutils.TestPermissionUtil.runAsShell;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import android.content.Context; import android.content.Context;
import android.icu.text.MessageFormat; import android.icu.text.MessageFormat;
@@ -62,6 +64,7 @@ import com.android.testutils.TestableNetworkCallback;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -74,6 +77,8 @@ import java.net.SocketTimeoutException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.time.Duration; import java.time.Duration;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.stream.Collectors;
@AppModeFull(reason = "Instant apps cannot access /dev/tun, so createTunInterface fails") @AppModeFull(reason = "Instant apps cannot access /dev/tun, so createTunInterface fails")
@RunWith(DevSdkIgnoreRunner.class) @RunWith(DevSdkIgnoreRunner.class)
@@ -102,6 +107,21 @@ public class RateLimitTest {
private Network mNetwork; private Network mNetwork;
private DatagramSocket mSocket; private DatagramSocket mSocket;
@BeforeClass
public static void assumeKernelSupport() {
final String result = SystemUtil.runShellCommandOrThrow("gzip -cd /proc/config.gz");
HashSet<String> kernelConfig = Arrays.stream(result.split("\\R")).collect(
Collectors.toCollection(HashSet::new));
// make sure that if for some reason /proc/config.gz returns an empty string, this test
// does not silently fail.
assertNotEquals(0, result.length());
assumeTrue(kernelConfig.contains("CONFIG_NET_CLS_MATCHALL=y"));
assumeTrue(kernelConfig.contains("CONFIG_NET_ACT_POLICE=y"));
assumeTrue(kernelConfig.contains("CONFIG_NET_ACT_BPF=y"));
}
@Before @Before
public void setUp() throws IOException { public void setUp() throws IOException {
mHandler = new Handler(Looper.getMainLooper()); mHandler = new Handler(Looper.getMainLooper());