Add some additional E2E tests for client #147
Merged
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
In several cases, we were not correctly calling callbacks when an exception occurred while reading a response body, parsing it using a Codec, or attempting to decompress it. Add some additional E2E tests in the new MockWebServerTests to exercise these failures and update the library code to handle the exceptions appropriately.
pkwarren
commented
Nov 8, 2023
| val responseCodec = serializationStrategy.codec(methodSpec.responseClass) | ||
| val responseMessage: Output | ||
| try { | ||
| responseMessage = responseCodec.deserialize(finalResponse.message) |
There was a problem hiding this comment.
We were missing exception handling around deserializing using the Codec, which lead to not notifying callers of a failure.
| @@ -95,13 +95,33 @@ internal class ConnectInterceptor( | |||
| val responseHeaders = | |||
| response.headers.filter { entry -> !entry.key.startsWith("trailer-") } | |||
| val compressionPool = clientConfig.compressionPool(responseHeaders[CONTENT_ENCODING]?.first()) | |||
| val responseBody = try { | |||
| compressionPool?.decompress(response.message.buffer) ?: response.message.buffer | |||
There was a problem hiding this comment.
Similarly we weren't handling exceptions properly when decompressing data.
| val error = parseConnectUnaryException(code = response.code, response.headers, response.message.buffer) | ||
| val error = parseConnectUnaryException(code = response.code, response.headers, responseBody) | ||
| // We've already read the response body to parse an error - don't read again. | ||
| message = Buffer() |
There was a problem hiding this comment.
@erawhctim - This fixes the issue before where we'd both read a JSON error response and then read again for the message.
| addHeader("accept-encoding", "gzip") | ||
| addHeader("content-encoding", "gzip") | ||
| setBody("this isn't gzipped") | ||
| setResponseCode(200) |
There was a problem hiding this comment.
Tests http status = 200, invalid compressed data.
| MockResponse().apply { | ||
| addHeader("accept-encoding", "gzip") | ||
| addHeader("content-type", "application/proto") | ||
| setBody("this isn't valid protobuf") |
There was a problem hiding this comment.
Tests http status = 200, invalid proto message.
| addHeader("accept-encoding", "gzip") | ||
| addHeader("content-type", "application/json") | ||
| setBody("{ invalid json") | ||
| setResponseCode(200) |
There was a problem hiding this comment.
Tests http status = 200, invalid json message.
erawhctim
approved these changes
Nov 8, 2023
smaye81
approved these changes
Nov 9, 2023
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 several cases, we were not correctly calling callbacks when an exception occurred while reading a response body, parsing it using a Codec, or attempting to decompress it. Add some additional E2E tests in the new MockWebServerTests to exercise these failures and update the library code to handle the exceptions appropriately.