commit d085587d7c54e63952055ec2daf7070c8c8f758f
author Remi NGUYEN VAN <reminv@google.com> Wed Feb 13 21:45:39 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 13 21:45:39 2019 -0800
tree 52ff0a4319f6bd3143687dd14f892afcf57788f7
parent 1d03680645b71f8ad5522a54dbe9e03e0c04202a
parent 0ed6920494bbee3ec2e72eabf79826e9c7d2f7ec

Merge "Fix flaky testNattSocketKeepalives" am: 16758070d0 am: def37aef89
am: 0ed6920494

Change-Id: Ibfdd4dddb8dad9ee26f9f1ec175ca87bc46ce761

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

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index a7c95c7..e57d838 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -3817,11 +3817,14 @@
     }
 
     @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 @@
         testSocket2.close();
 
         mWiFiNetworkAgent.disconnect();
+        waitFor(mWiFiNetworkAgent.getDisconnectedCV());
     }
 
     @Test