commit 296c5ed68d2b1afd27b70dca380f60f543768ecd
author Remi NGUYEN VAN <reminv@google.com> Thu Feb 14 03:29:00 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 14 03:29:00 2019 +0000
tree 67c6ec71d5fc49418ed6516b26072a6a91f3a45a
parent b5b671abfd07c87b5dedb820e01526d61d10e4b0
parent cb0b1fc56125257eb7d451e8098f572b0f2a2b84

Merge "Fix flaky testNattSocketKeepalives"

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 963b685..c83ab84 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -3791,11 +3791,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);
     }
@@ -3937,6 +3940,7 @@
         testSocket2.close();
 
         mWiFiNetworkAgent.disconnect();
+        waitFor(mWiFiNetworkAgent.getDisconnectedCV());
     }
 
     @Test