grpc: Clean up initialization and allocation of timers in the test #4226
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
Signed-off-by: Joshua Marantz <jmarantz@google.com>
|
@htuch ptal; this should be easy. |
htuch
reviewed
Aug 22, 2018
| @@ -76,8 +70,8 @@ class GrpcMuxImplTest : public testing::Test { | |||
| NiceMock<Event::MockDispatcher> dispatcher_; | |||
| Runtime::MockRandomGenerator random_; | |||
| Grpc::MockAsyncClient* async_client_; | |||
| Event::MockTimer* timer_; | |||
| Event::TimerCb timer_cb_; | |||
| Event::MockTimer* timer_; // Only used by ResetStream | |||
There was a problem hiding this comment.
This looks like a nice cleanup. Can you just move these two variables to be local to ResetStream? This will make reasoning even simpler.
Signed-off-by: Joshua Marantz <jmarantz@google.com>
htuch
approved these changes
Aug 22, 2018
|
Anything else needed before you merge? |
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.
Signed-off-by: Joshua Marantz jmarantz@google.com
Description: The management of the timer_ variable in the test class was a little funky, and looked leak-prone. This PR cleans this up a little,. Without this PR, #4180 memory-leaks on this test, I think due to overwriting timer_. This is all toward resolution of #4160
Risk Level: Low.
Testing: //test/common/config:grpc_mux_impl_test
Docs Changes: n/a
Release Notes: n/a