diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2020-05-28 15:55:33 +0800 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2020-05-29 02:52:47 +0000 |
| commit | 7fb8da7355bb7b12a1e2ef2200276feb38a1260e (patch) | |
| tree | 8800108a6a0240f8e2c870447c4fe779cf6703b4 | |
| parent | 59b66b8f2c3ab4ad3d9ecf372e12a498f0a45f5a (diff) | |
Prevent race in NetworkMonitorTest
Move setupTcpDataStall to do before preparing test NM.
Bug: 157612829
Test: atest com.android.server.connectivity.NetworkMonitorTest\
#testDataStall_StallTcpSuspectedAndSendMetricsOnWifi\
--iterations 30
Change-Id: I764a97b1007613e7d1c19ec6294faac27bea1fef
Merged-In: I764a97b1007613e7d1c19ec6294faac27bea1fef
| -rw-r--r-- | tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java index f0a7bfb..67b8a9b 100644 --- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java +++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java @@ -1805,10 +1805,11 @@ public class NetworkMonitorTest { private void testDataStall_StallTcpSuspectedAndSendMetrics(int transport, NetworkCapabilities nc) throws Exception { assumeTrue(ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.Q)); + setupTcpDataStall(); // NM suspects data stall from TCP signal and sends data stall metrics. setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_TCP); final WrappedNetworkMonitor nm = prepareNetworkMonitorForVerifyDataStall(nc); - setupTcpDataStall(); + // Trigger a tcp event immediately. setTcpPollingInterval(0); nm.sendTcpPollingEvent(); |