Merge "Fix flaky testNattSocketKeepalives" (16758070) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -3791,11 +3791,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);
		}
		@@ -3937,6 +3940,7 @@ public class ConnectivityServiceTest {
		testSocket2.close();

		mWiFiNetworkAgent.disconnect();
		waitFor(mWiFiNetworkAgent.getDisconnectedCV());
		}

		@Test