From 6f8e61226444178d653f151f3066946fb60cf30b Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Tue, 21 Apr 2020 03:46:08 +0000 Subject: [PATCH] Remove upper bound check of getTotal* APIs in TrafficStatsTest Currently, this cause flakiness since some background traffic was counted when performing tests, or the traffic generated by adb over network. While there is no good way to filter out all reasonable cases, disable the upper bound checks. Test: atest TrafficStatsTest Bug: 142978584 Change-Id: I22edc46039bf35e544d9ce8a9f3a00b713478e05 Merged-In: I22edc46039bf35e544d9ce8a9f3a00b713478e05 Merged-In: I8140310c9caeff6069d1f55590bf40f83bf211e4 (cherry picked from commit 8accc6aa11213a7a8287a2ec0f75f17a02173f99) --- .../src/android/net/cts/TrafficStatsTest.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/TrafficStatsTest.java b/tests/cts/net/src/android/net/cts/TrafficStatsTest.java index 577e24ac29..37bdd44fbf 100755 --- a/tests/cts/net/src/android/net/cts/TrafficStatsTest.java +++ b/tests/cts/net/src/android/net/cts/TrafficStatsTest.java @@ -16,11 +16,9 @@ package android.net.cts; -import android.content.pm.PackageManager; import android.net.NetworkStats; import android.net.TrafficStats; import android.os.Process; -import android.os.SystemProperties; import android.platform.test.annotations.AppModeFull; import android.test.AndroidTestCase; import android.util.Log; @@ -267,28 +265,6 @@ public class TrafficStatsTest extends AndroidTestCase { assertTrue("ifrxp: " + ifaceRxPacketsBefore + " -> " + ifaceRxPacketsAfter, totalRxPacketsAfter >= totalRxPacketsBefore + ifaceRxDeltaPackets); - // If the adb TCP port is opened, this test may be run by adb over network. - // Huge amount of data traffic might go through the network and accounted into total packets - // stats. The upper bound check would be meaningless. - // TODO: Consider precisely calculate the traffic accounted due to adb over network and - // subtract it when checking upper bound instead of skip checking. - final PackageManager pm = mContext.getPackageManager(); - if (SystemProperties.getInt("persist.adb.tcp.port", -1) > -1 - || SystemProperties.getInt("service.adb.tcp.port", -1) > -1 - || !pm.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)) { - Log.i(LOG_TAG, "adb is running over the network, skip the upper bound check"); - } else { - // Fudge by 132 packets of 1500 bytes not related to the test. - assertTrue("ttxp: " + totalTxPacketsBefore + " -> " + totalTxPacketsAfter, - totalTxPacketsAfter <= totalTxPacketsBefore + uidTxDeltaPackets + 132); - assertTrue("trxp: " + totalRxPacketsBefore + " -> " + totalRxPacketsAfter, - totalRxPacketsAfter <= totalRxPacketsBefore + uidRxDeltaPackets + 132); - assertTrue("ttxb: " + totalTxBytesBefore + " -> " + totalTxBytesAfter, - totalTxBytesAfter <= totalTxBytesBefore + uidTxDeltaBytes + 132 * 1500); - assertTrue("trxb: " + totalRxBytesBefore + " -> " + totalRxBytesAfter, - totalRxBytesAfter <= totalRxBytesBefore + uidRxDeltaBytes + 132 * 1500); - } - // Localhost traffic should *not* count against mobile stats, // There might be some other traffic, but nowhere near 1MB. assertInRange("mtxp", mobileTxPacketsAfter, mobileTxPacketsBefore,