aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Aranda <miguelaranda@google.com>2024-05-07 14:00:26 +0000
committerMiguel Aranda <miguelaranda@google.com>2024-05-07 15:13:41 +0000
commit760b40511994eab889502d50eb3ed0cb77136836 (patch)
tree0f894e05b8aee209d0a41ee86cb19c627b397a61
parent55b8ed1d505e4fc9654f19961be2e9d67001f74e (diff)
downloadconscrypt-760b40511994eab889502d50eb3ed0cb77136836.tar.gz
Ignore test_SSLSocket_SSLv3Unsupported.android11-tests-dev
Merged-In: I5ada826307d186532f578acf55461e52870d050b Change-Id: If3b530b8b6a47c930ce99004adcd6446a2b4ed72
-rw-r--r--common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java2
-rw-r--r--repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java2
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)