Close server sockets in TLS/JSSE tests

- bcgit#174
AaronAlc · Mar 18, 2017 · 94abc84 · 94abc84
1 parent 7443022
commit 94abc84
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 12 deletions.
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/HTTPSServerThread.java b/core/src/test/java/org/bouncycastle/crypto/tls/test/HTTPSServerThread.java
@@ -104,6 +104,7 @@ public void run()
             sendResponse(sslSock.getOutputStream());
 
             sslSock.close();
+            sSock.close();
         }
         catch (Exception e)
         {

diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsServerTest.java b/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsServerTest.java
@@ -29,13 +29,20 @@ public static void main(String[] args)
         int port = 5556;
 
         ServerSocket ss = new ServerSocket(port, 16, address);
-        while (true)
+        try
         {
-            Socket s = ss.accept();
-            System.out.println("--------------------------------------------------------------------------------");
-            System.out.println("Accepted " + s);
-            ServerThread t = new ServerThread(s);
-            t.start();
+            while (true)
+            {
+                Socket s = ss.accept();
+                System.out.println("--------------------------------------------------------------------------------");
+                System.out.println("Accepted " + s);
+                ServerThread t = new ServerThread(s);
+                t.start();
+            }
+        }
+        finally
+        {
+            ss.close();
         }
     }
 

diff --git a/tls/src/test/java/org/bouncycastle/jsse/provider/test/BasicClientAuthTlsTest.java b/tls/src/test/java/org/bouncycastle/jsse/provider/test/BasicClientAuthTlsTest.java
@@ -173,6 +173,7 @@ public Exception call()
                 TestProtocolUtil.doServerProtocol(sslSock, "World");
 
                 sslSock.close();
+                sSock.close();
             }
             finally
             {

diff --git a/tls/src/test/java/org/bouncycastle/jsse/provider/test/BasicTlsTest.java b/tls/src/test/java/org/bouncycastle/jsse/provider/test/BasicTlsTest.java
@@ -126,6 +126,9 @@ public Exception call()
                 sslSock.setUseClientMode(false);
 
                 TestProtocolUtil.doServerProtocol(sslSock, "World");
+
+                sslSock.close();
+                sSock.close();
             }
             finally
             {

diff --git a/tls/src/test/java/org/bouncycastle/jsse/provider/test/CipherSuitesTestCase.java b/tls/src/test/java/org/bouncycastle/jsse/provider/test/CipherSuitesTestCase.java
@@ -160,6 +160,9 @@ public Exception call()
                 this.tlsUnique = TestUtils.getChannelBinding(sslSock, "tls-unique");
 
                 TestProtocolUtil.doServerProtocol(sslSock, "World");
+
+                sslSock.close();
+                sSock.close();
             }
             finally
             {

diff --git a/tls/src/test/java/org/bouncycastle/tls/test/HTTPSServerThread.java b/tls/src/test/java/org/bouncycastle/tls/test/HTTPSServerThread.java
@@ -103,6 +103,7 @@ public void run()
             sendResponse(sslSock.getOutputStream());
 
             sslSock.close();
+            sSock.close();
         }
         catch (Exception e)
         {

diff --git a/tls/src/test/java/org/bouncycastle/tls/test/TlsServerTest.java b/tls/src/test/java/org/bouncycastle/tls/test/TlsServerTest.java
@@ -26,13 +26,20 @@ public static void main(String[] args)
         int port = 5556;
 
         ServerSocket ss = new ServerSocket(port, 16, address);
-        while (true)
+        try
         {
-            Socket s = ss.accept();
-            System.out.println("--------------------------------------------------------------------------------");
-            System.out.println("Accepted " + s);
-            ServerThread t = new ServerThread(s);
-            t.start();
+            while (true)
+            {
+                Socket s = ss.accept();
+                System.out.println("--------------------------------------------------------------------------------");
+                System.out.println("Accepted " + s);
+                ServerThread t = new ServerThread(s);
+                t.start();
+            }
+        }
+        finally
+        {
+            ss.close();
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -173,6 +173,7 @@ public Exception call() @@
                     TestProtocolUtil.doServerProtocol(sslSock, "World");
                     sslSock.close();
+                    sSock.close();
                 }
                 finally
                 {
@@ Expand Down @@