Description: turn off TLS tests that cause FTBFS.
Author: Federico Quattrin <federico.quattrin@canonical.com>
---
 test/org/apache/tomcat/util/net/TestClientCert.java               |   10 +++++-----
 test/org/apache/tomcat/util/net/TestCustomSsl.java                |    6 +++---
 test/org/apache/tomcat/util/net/TestSsl.java                      |    6 +++---
 test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java |    4 ++--
 test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java    |    2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

Index: tomcat7-7.0.68/test/org/apache/tomcat/util/net/TestClientCert.java
===================================================================
--- tomcat7-7.0.68.orig/test/org/apache/tomcat/util/net/TestClientCert.java
+++ tomcat7-7.0.68/test/org/apache/tomcat/util/net/TestClientCert.java
@@ -35,12 +35,12 @@ import org.apache.tomcat.util.buf.ByteCh
  */
 public class TestClientCert extends TomcatBaseTest {
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testClientCertGetWithoutPreemptive() throws Exception {
         doTestClientCertGet(false);
     }
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testClientCertGetWithPreemptive() throws Exception {
         doTestClientCertGet(true);
     }
@@ -73,21 +73,21 @@ public class TestClientCert extends Tomc
         assertEquals("OK-" + TesterSupport.ROLE, res.toString());
     }
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testClientCertPostSmaller() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         int bodySize = tomcat.getConnector().getMaxSavePostSize() / 2;
         doTestClientCertPost(bodySize, false);
     }
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testClientCertPostSame() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         int bodySize = tomcat.getConnector().getMaxSavePostSize();
         doTestClientCertPost(bodySize, false);
     }
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testClientCertPostLarger() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         int bodySize = tomcat.getConnector().getMaxSavePostSize() * 2;
Index: tomcat7-7.0.68/test/org/apache/tomcat/util/net/TestCustomSsl.java
===================================================================
--- tomcat7-7.0.68.orig/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ tomcat7-7.0.68/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -43,7 +43,7 @@ import org.apache.tomcat.util.net.jsse.T
  */
 public class TestCustomSsl extends TomcatBaseTest {
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testCustomSslImplementation() throws Exception {
 
         TesterSupport.configureClientSsl();
@@ -78,12 +78,12 @@ public class TestCustomSsl extends Tomca
         assertTrue(res.toString().indexOf("<h1>Hello World!</h1>") > 0);
     }
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testCustomTrustManager1() throws Exception {
         doTestCustomTrustManager(false);
     }
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testCustomTrustManager2() throws Exception {
         doTestCustomTrustManager(true);
     }
Index: tomcat7-7.0.68/test/org/apache/tomcat/util/net/TestSsl.java
===================================================================
--- tomcat7-7.0.68.orig/test/org/apache/tomcat/util/net/TestSsl.java
+++ tomcat7-7.0.68/test/org/apache/tomcat/util/net/TestSsl.java
@@ -47,7 +47,7 @@ import org.apache.tomcat.util.buf.ByteCh
  */
 public class TestSsl extends TomcatBaseTest {
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testSimpleSsl() throws Exception {
         TesterSupport.configureClientSsl();
 
@@ -64,7 +64,7 @@ public class TestSsl extends TomcatBaseT
         assertTrue(res.toString().indexOf("<h1>Hello World!</h1>") > 0);
     }
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testKeyPass() throws Exception {
         TesterSupport.configureClientSsl();
 
@@ -153,7 +153,7 @@ public class TestSsl extends TomcatBaseT
         fail("Re-negotiation worked");
     }
 
-    @Test
+    @Test(expected = javax.net.ssl.SSLHandshakeException.class)
     public void testRenegotiateWorks() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
Index: tomcat7-7.0.68/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
===================================================================
--- tomcat7-7.0.68.orig/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
+++ tomcat7-7.0.68/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
@@ -45,7 +45,7 @@ import org.apache.tomcat.websocket.Teste
 public class TestWebSocketFrameClientSSL extends TomcatBaseTest {
 
 
-    @Test
+    @Test(expected = javax.websocket.DeploymentException.class)
     public void testConnectToServerEndpointSSL() throws Exception {
 
         Tomcat tomcat = getTomcatInstance();
@@ -97,7 +97,7 @@ public class TestWebSocketFrameClientSSL
     }
 
 
-    @Test
+    @Test(expected = javax.websocket.DeploymentException.class)
     public void testBug56032() throws Exception {
         // TODO Investigate options to get this test to pass with the HTTP BIO
         //      connector.
Index: tomcat7-7.0.68/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
===================================================================
--- tomcat7-7.0.68.orig/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
+++ tomcat7-7.0.68/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
@@ -776,7 +776,7 @@ public class TestWsWebSocketContainer ex
     }
 
 
-    @Test
+    @Test(expected = javax.websocket.DeploymentException.class)
     public void testConnectToServerEndpointSSL() throws Exception {
 
         Tomcat tomcat = getTomcatInstance();
