android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-12 10:23:16 +03:00
Code Releases Activity

Enable additional passing tests for conscrypt (#5227)

Browse Source 
* Testing conscrypt

* Revert circleci
This commit is contained in:
Yuri Schimke
2019-06-25 03:27:27 +01:00
committed by Jesse Wilson
parent abe49cf435
commit b16b63fa4a
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
okhttp/src/test/java/okhttp3/ConnectionCoalescingTest.java
View File

@@ -51,7 +51,6 @@ public final class ConnectionCoalescingTest {
private List<InetAddress> serverIps; private List<InetAddress> serverIps;
@Before public void setUp() throws Exception { @Before public void setUp() throws Exception {
platform.assumeNotConscrypt();
platform.assumeHttp2Support(); platform.assumeHttp2Support();
rootCa = new HeldCertificate.Builder() rootCa = new HeldCertificate.Builder()
@@ -302,20 +301,6 @@ public final class ConnectionCoalescingTest {
assertThat(client.connectionPool().connectionCount()).isEqualTo(1); assertThat(client.connectionPool().connectionCount()).isEqualTo(1);
} }
/** Run against public external sites, doesn't run by default. */
@Ignore
@Test public void coalescesConnectionsToRealSites() throws IOException {
client = new OkHttpClient();
assert200Http2Response(execute("https://graph.facebook.com/robots.txt"), "graph.facebook.com");
assert200Http2Response(execute("https://www.facebook.com/robots.txt"), "m.facebook.com");
assert200Http2Response(execute("https://fb.com/robots.txt"), "m.facebook.com");
assert200Http2Response(execute("https://messenger.com/robots.txt"), "messenger.com");
assert200Http2Response(execute("https://m.facebook.com/robots.txt"), "m.facebook.com");
assertThat(client.connectionPool().connectionCount()).isEqualTo(3);
}
private Response execute(String url) throws IOException { private Response execute(String url) throws IOException {
return execute(HttpUrl.get(url)); return execute(HttpUrl.get(url));
} }

2
okhttp/src/test/java/okhttp3/internal/tls/ClientAuthTest.java
View File

@@ -66,8 +66,6 @@ public final class ClientAuthTest {
@Before @Before
public void setUp() { public void setUp() {
platform.assumeNotConscrypt();
serverRootCa = new HeldCertificate.Builder() serverRootCa = new HeldCertificate.Builder()
.serialNumber(1L) .serialNumber(1L)
.certificateAuthority(1) .certificateAuthority(1)