android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-08-01 16:06:56 +03:00
Code Releases Activity

Run CircleCI with multiple platforms (#4864)

Browse Source 
Run in CircleCI.
Also conditionally disables tests that show issues with Conscrypt/OkHttp (client auth etc).
This commit is contained in:
Yuri Schimke
2019-04-03 15:45:05 +01:00
committed by GitHub
parent b0bc07f9ac
commit 1f93359f15
9 changed files with 114 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
okhttp-logging-interceptor/src/test/java/okhttp3/logging/HttpLoggingInterceptorTest.java
View File

@ -19,6 +19,7 @@ import java.io.IOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import javax.net.ssl.HostnameVerifier;
import okhttp3.HttpUrl;
@ -853,7 +854,7 @@ public final class HttpLoggingInterceptorTest {
LogRecorder assertLogMatch(String pattern) {
assertThat(index).overridingErrorMessage("No more messages found").isLessThan(logs.size());
String actual = logs.get(index++);
assertThat(actual).matches(pattern);
assertThat(actual).matches(Pattern.compile(pattern, Pattern.DOTALL));
return this;
}

4
okhttp-logging-interceptor/src/test/java/okhttp3/logging/LoggingEventListenerTest.java
View File

@ -209,9 +209,9 @@ public final class LoggingEventListenerTest {
.assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT")
.assertLogMatch("secureConnectStart")
.assertLogMatch(
"connectFailed: null javax\\.net\\.ssl\\.SSLProtocolException: (?:Unexpected handshake message: client_hello|Handshake message sequence violation, 1)")
"connectFailed: null javax\\.net\\.ssl\\.(?:SSLProtocolException|SSLHandshakeException): (?:Unexpected handshake message: client_hello|Handshake message sequence violation, 1|Read error).*")
.assertLogMatch(
"callFailed: javax\\.net\\.ssl\\.SSLProtocolException: (?:Unexpected handshake message: client_hello|Handshake message sequence violation, 1)")
"callFailed: javax\\.net\\.ssl\\.(?:SSLProtocolException|SSLHandshakeException): (?:Unexpected handshake message: client_hello|Handshake message sequence violation, 1|Read error).*")
.assertNoMoreLogs();
}