Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fb8da73 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

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
parent 59b66b8f

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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();