Snap for 11820043 from 760b40511994eab889502d50eb3ed0cb77136836 to android11-tests-releaseandroid11-tests-release

Change-Id: If807e4143da98a1b78d98731bc2c46e575aebcd8

2 files changed, 4 insertions, 0 deletions

diff --git a/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java b/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java
index 8a86af14..09e351d8 100644
--- a/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java
+++ b/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java
@@ -104,6 +104,7 @@ import org.conscrypt.tlswire.record.TlsProtocols;
 import org.conscrypt.tlswire.record.TlsRecord;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -1806,6 +1807,7 @@ public class SSLSocketVersionCompatibilityTest {
     }
 
     @Test
+    @Ignore("Fails with conscrypt module updates due to SSL removal")
     public void test_SSLSocket_SSLv3Unsupported() throws Exception {
         TestSSLContext context = new TestSSLContext.Builder()
                 .clientProtocol(clientVersion)
diff --git a/repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java b/repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java
index 2552cb3e..ad109baa 100644
--- a/repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java
+++ b/repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java
@@ -105,6 +105,7 @@ import javax.net.ssl.X509KeyManager;
 import javax.net.ssl.X509TrustManager;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -1807,6 +1808,7 @@ public class SSLSocketVersionCompatibilityTest {
     }
 
     @Test
+    @Ignore("Fails with conscrypt module updates due to SSL removal")
     public void test_SSLSocket_SSLv3Unsupported() throws Exception {
         TestSSLContext context = new TestSSLContext.Builder()
                 .clientProtocol(clientVersion)