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

Commit 3e36c0ca authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix flaky testNotifyNetwork_WithforceReevaluation test" am: 8a132765... 

Merge "Fix flaky testNotifyNetwork_WithforceReevaluation test" am: 8a132765 am: 2c43e2b4 am: 31ee6a5d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1535725

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9fc439975436328bd4469d4491a6e87a339a4ac
parents 1e51cb3e 31ee6a5d

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