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

Merge "Add CTS support for eBPF" am: 5cf3c2fe86

Browse Source 
am: 480d14e881

Change-Id: I8d0ff6e935d7495c14129fbf7334973417166bdd
This commit is contained in:
Benedict Wong
2018-04-25 17:42:34 -07:00
committed by android-build-merger
parent e952b1302c fe9b0a791e
commit aa96bdc3a8
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/cts/net/src/android/net/cts/IpSecManagerTest.java
View File

@@ -353,7 +353,8 @@ public class IpSecManagerTest extends IpSecBaseTest {
private static void assertUidStatsDelta(
int expectedTxByteDelta,
int expectedTxPacketDelta,
int expectedRxByteDelta,
int minRxByteDelta,
int maxRxByteDelta,
int expectedRxPacketDelta) {
long newUidTxBytes = TrafficStats.getUidTxBytes(Os.getuid());
long newUidRxBytes = TrafficStats.getUidRxBytes(Os.getuid());
@@ -361,7 +362,9 @@ public class IpSecManagerTest extends IpSecBaseTest {
long newUidRxPackets = TrafficStats.getUidRxPackets(Os.getuid());
assertEquals(expectedTxByteDelta, newUidTxBytes - uidTxBytes);
assertEquals(expectedRxByteDelta, newUidRxBytes - uidRxBytes);
assertTrue(
newUidRxBytes - uidRxBytes >= minRxByteDelta
&& newUidRxBytes - uidRxBytes <= maxRxByteDelta);
assertEquals(expectedTxPacketDelta, newUidTxPackets - uidTxPackets);
assertEquals(expectedRxPacketDelta, newUidRxPackets - uidRxPackets);
}
@@ -561,13 +564,13 @@ public class IpSecManagerTest extends IpSecBaseTest {
StatsChecker.waitForNumPackets(expectedPackets);
if (udpEncapLen != 0) {
StatsChecker.assertUidStatsDelta(
expectedOuterBytes, expectedPackets, expectedOuterBytes, expectedPackets);
} else {
StatsChecker.assertUidStatsDelta(
expectedOuterBytes, expectedPackets, expectedInnerBytes, expectedPackets);
}
// eBPF only counts inner packets, whereas xt_qtaguid counts outer packets. Allow both
StatsChecker.assertUidStatsDelta(
expectedOuterBytes,
expectedPackets,
expectedInnerBytes,
expectedOuterBytes,
expectedPackets);
// Unreliable at low numbers due to potential interference from other processes.
if (sendCount >= 1000) {
@@ -607,7 +610,11 @@ public class IpSecManagerTest extends IpSecBaseTest {
StatsChecker.waitForNumPackets(expectedNumPkts);
StatsChecker.assertUidStatsDelta(
expectedPacketSize, expectedNumPkts, expectedPacketSize, expectedNumPkts);
expectedPacketSize,
expectedNumPkts,
expectedPacketSize,
expectedPacketSize,
expectedNumPkts);
StatsChecker.assertIfaceStatsDelta(
expectedPacketSize, expectedNumPkts, expectedPacketSize, expectedNumPkts);
}