LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix flaky testNattSocketKeepalives"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-02-14 03:29:00 +00:00
committed by Gerrit Code Review
parent b25c9a6cb3 b76f9ee4e6
commit 9a9e288607
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -3791,11 +3791,14 @@ public class ConnectivityServiceTest {
} }
@Test @Test
public void testNattSocketKeepalives() throws Exception { public void testNattSocketKeepalives_SingleThreadExecutor() throws Exception {
final ExecutorService executorSingleThread = Executors.newSingleThreadExecutor(); final ExecutorService executorSingleThread = Executors.newSingleThreadExecutor();
doTestNattSocketKeepalivesWithExecutor(executorSingleThread); doTestNattSocketKeepalivesWithExecutor(executorSingleThread);
executorSingleThread.shutdown(); executorSingleThread.shutdown();
}
@Test
public void testNattSocketKeepalives_InlineExecutor() throws Exception {
final Executor executorInline = (Runnable r) -> r.run(); final Executor executorInline = (Runnable r) -> r.run();
doTestNattSocketKeepalivesWithExecutor(executorInline); doTestNattSocketKeepalivesWithExecutor(executorInline);
} }
@@ -3937,6 +3940,7 @@ public class ConnectivityServiceTest {
testSocket2.close(); testSocket2.close();
mWiFiNetworkAgent.disconnect(); mWiFiNetworkAgent.disconnect();
waitFor(mWiFiNetworkAgent.getDisconnectedCV());
} }
@Test @Test