From cb57c86657f230c34480ceb72cdbce43fe62302f Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 3 Jul 2015 17:38:43 +0100 Subject: [PATCH] Fix missing socket closure in LocalSocketTest Noticed as a result of 8fbc09bde8c5723d57a3b188e7fc69916cc62cca. One of the AF_UNIX sockets being created in three tests was not being closed (until GC/finalization). Because the name is now used in multiple tests some of the tests would fail in the CTS test runner ("Address already in use") if no GC had occurred. Bug: 3106438 Change-Id: I7debe5ed26d9d09e71a3d8a1b5b7d85b13e6e069 --- tests/cts/net/src/android/net/cts/LocalSocketTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/cts/LocalSocketTest.java b/tests/cts/net/src/android/net/cts/LocalSocketTest.java index 22a2c7a2d9..9da8fbe272 100644 --- a/tests/cts/net/src/android/net/cts/LocalSocketTest.java +++ b/tests/cts/net/src/android/net/cts/LocalSocketTest.java @@ -116,7 +116,7 @@ public class LocalSocketTest extends AndroidTestCase{ public void testAccessors() throws IOException{ LocalSocket socket = new LocalSocket(); - LocalSocketAddress addr = new LocalSocketAddress("secondary"); + LocalSocketAddress addr = new LocalSocketAddress(mSockAddr); assertFalse(socket.isBound()); socket.bind(addr); @@ -170,6 +170,8 @@ public class LocalSocketTest extends AndroidTestCase{ } catch (UnsupportedOperationException e) { // expected } + + socket.close(); } public void testAvailable() throws Exception { @@ -198,6 +200,7 @@ public class LocalSocketTest extends AndroidTestCase{ clientSocket.close(); serverSocket.close(); + localServerSocket.close(); } public void testFlush() throws Exception { @@ -220,6 +223,7 @@ public class LocalSocketTest extends AndroidTestCase{ clientSocket.close(); serverSocket.close(); + localServerSocket.close(); } private void testFlushWorks(OutputStream outputStream, InputStream inputStream)