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

Commit d085587d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Fix flaky testNattSocketKeepalives" am: 16758070 am: def37aef 

am: 0ed69204

Change-Id: Ibfdd4dddb8dad9ee26f9f1ec175ca87bc46ce761
parents 1d036806 0ed69204

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

+5 −1
Original line number Diff line number Diff line
@@ -3817,11 +3817,14 @@ public class ConnectivityServiceTest { 
    }



    @Test

    public void testNattSocketKeepalives() throws Exception {

    public void testNattSocketKeepalives_SingleThreadExecutor() throws Exception {

        final ExecutorService executorSingleThread = Executors.newSingleThreadExecutor();

        doTestNattSocketKeepalivesWithExecutor(executorSingleThread);

        executorSingleThread.shutdown();

    }



    @Test

    public void testNattSocketKeepalives_InlineExecutor() throws Exception {

        final Executor executorInline = (Runnable r) -> r.run();

        doTestNattSocketKeepalivesWithExecutor(executorInline);

    }
@@ -3963,6 +3966,7 @@ public class ConnectivityServiceTest { 
        testSocket2.close();



        mWiFiNetworkAgent.disconnect();

        waitFor(mWiFiNetworkAgent.getDisconnectedCV());

    }



    @Test