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

Commit a1a987fe authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Fix flaky testNotifyNetwork_WithforceReevaluation test 

The test incorrectly starts two NetworkMonitors on single test.
But the callback object that is used for verifying the result is
the same one. Thus, the test will be flaky depending on the
timing on when verification starts and when the verification
result comes up. Update the test to use the same NM object.

Bug: 175330953
Test: atest NetworkMonitorTest#\
testNotifyNetwork_WithforceReevaluation --rerun-until-failure 50

Change-Id: I78463f83f0627783f2f49f7f13805ccac2df27d1
parent 47e51e4b

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

+2 −1
Original line number Diff line number Diff line
@@ -2285,9 +2285,10 @@ public class NetworkMonitorTest { 
        setStatus(mFallbackConnection, 204);

        nm.forceReevaluation(Process.myUid());

        // Expect to send HTTP, HTTPs, FALLBACK and evaluation results.

        runNetworkTest(VALIDATION_RESULT_INVALID,

        verifyNetworkTested(VALIDATION_RESULT_INVALID,

                NETWORK_VALIDATION_PROBE_DNS | NETWORK_VALIDATION_PROBE_FALLBACK,

                null /* redirectUrl */);

        HandlerUtils.waitForIdle(nm.getHandler(), HANDLER_TIMEOUT_MS);

    }



    @Test