Update test exception expectations + modify socket timeout exception #1698
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -307,8 +308,8 @@ protected HttpOverSpdyTest(Protocol protocol){ | |||
| try { | |||
| readAscii(connection.getInputStream(), Integer.MAX_VALUE); | |||
| fail("Should have timed out!"); | |||
| } catch (IOException e){ | |||
| assertEquals("timeout", e.getMessage()); | |||
| } catch (SocketTimeoutException expected){ | |||
There was a problem hiding this comment.
(though this was broken before; ugh)
|
Awesome, LGTM The one thing you're missing is you need to change pom.xml to reference the Okio snapshot. If you don't get to it I'll take care of that later. |
|
No hurry on my part for you accepting this: I wanted the upstream pull so I had something to reference in Android. With the M preview out there things are getting fairly advanced so I'm just cherry-picking. I'll get the nits sorted tomorrow. |
Related to issue square#1676. Depends on square/okio#154 URLConnection should throw SocketTimeoutException for timeouts not InterruptedIOException.
|
Nits done. |
|
Merged manually. |
cm-gerrit
pushed a commit
to CyanogenMod/android_external_okhttp
that referenced
this pull request
Oct 6, 2015
Contains upstream changes: Okio: square/okio#154 OkHttp: square/okhttp#1698 (pending) Bug: 21396523 (cherry-picked from commit b5f9076) Change-Id: I4d44e973f906d41a622598e2293d4026fc1ed039
cm-gerrit
pushed a commit
to CyanogenMod/android_external_okhttp
that referenced
this pull request
Oct 6, 2015
Contains upstream changes: Okio: square/okio#154 OkHttp: square/okhttp#1698 (pending) Bug: 21396523 (cherry-picked from commit b5f9076) Change-Id: I4d44e973f906d41a622598e2293d4026fc1ed039
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In anticipation of taking a new Okio version containing square/okio#154
Related to issue #1676.
Depends on square/okio#154
URLConnection should throw SocketTimeoutException for timeouts
not InterruptedIOException.