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

Commit b299b841 authored by Chalard Jean's avatar Chalard Jean
Browse files

Decrease load-related flakiness in ConnectivityServiceTest 

Almost always this timeout is not waited anyway.

Test: ConnectivityServiceTest
Change-Id: I74376633d0ec8d93fb48609a4df73cad5fc5d508
parent 5d8d5f9a

tests/net/java/com/android/server/ConnectivityServiceTest.java

+6 −2
Original line number Diff line number Diff line
@@ -258,13 +258,13 @@ public class ConnectivityServiceTest { 
    private static final String TAG = "ConnectivityServiceTest";



    private static final int TIMEOUT_MS = 500;

    private static final int TEST_LINGER_DELAY_MS = 250;

    private static final int TEST_LINGER_DELAY_MS = 300;

    // Chosen to be less than the linger timeout. This ensures that we can distinguish between a

    // LOST callback that arrives immediately and a LOST callback that arrives after the linger

    // timeout. For this, our assertions should run fast enough to leave less than

    // (mService.mLingerDelayMs - TEST_CALLBACK_TIMEOUT_MS) between the time callbacks are

    // supposedly fired, and the time we call expectCallback.

    private static final int TEST_CALLBACK_TIMEOUT_MS = 200;

    private static final int TEST_CALLBACK_TIMEOUT_MS = 250;

    // Chosen to be less than TEST_CALLBACK_TIMEOUT_MS. This ensures that requests have time to

    // complete before callbacks are verified.

    private static final int TEST_REQUEST_TIMEOUT_MS = 150;
@@ -1466,6 +1466,10 @@ public class ConnectivityServiceTest { 
     * received. assertNoCallback may be called at any time.

     */

    private class TestNetworkCallback extends TestableNetworkCallback {

        TestNetworkCallback() {

            super(TEST_CALLBACK_TIMEOUT_MS);

        }



        @Override

        public void assertNoCallback() {

            // TODO: better support this use case in TestableNetworkCallback