Skip to content

redis: Fix stack-use-after-scope in test #10840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 2 commits into from
Apr 21, 2020
Merged

redis: Fix stack-use-after-scope in test #10840

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaec00a
redis: Fix stack-use-after-scope in test
Apr 19, 2020
d0fe430
"fix" test
Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions test/extensions/clusters/redis/redis_cluster_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ class RedisClusterTest : public testing::Test,
Network::DnsResolver::ResolutionStatus status =
Network::DnsResolver::ResolutionStatus::Success) {
EXPECT_CALL(*dns_resolver_, resolve(expected_address, dns_lookup_family, _))
.WillOnce(Invoke([&](const std::string&, Network::DnsLookupFamily,
.WillOnce(Invoke([status, resolved_addresses](
const std::string&, Network::DnsLookupFamily,
Network::DnsResolver::ResolveCb cb) -> Network::ActiveDnsQuery* {
cb(status, TestUtility::makeDnsResponse(resolved_addresses));
return nullptr;
Expand Down Expand Up @@ -685,7 +686,7 @@ TEST_F(RedisClusterTest, FailedDnsResponse) {

EXPECT_EQ(0UL, cluster_->prioritySet().hostSetsPerPriority()[0]->hosts().size());
EXPECT_EQ(0UL, cluster_->prioritySet().hostSetsPerPriority()[0]->healthyHosts().size());
EXPECT_EQ(1U, cluster_->info()->stats().update_empty_.value());
EXPECT_EQ(0U, cluster_->info()->stats().update_empty_.value());

// Does not recreate the timer on subsequent DNS resolve calls.
EXPECT_CALL(*dns_timer, enableTimer(_, _));
Expand All @@ -694,7 +695,7 @@ TEST_F(RedisClusterTest, FailedDnsResponse) {

EXPECT_EQ(0UL, cluster_->prioritySet().hostSetsPerPriority()[0]->hosts().size());
EXPECT_EQ(0UL, cluster_->prioritySet().hostSetsPerPriority()[0]->healthyHosts().size());
EXPECT_EQ(2U, cluster_->info()->stats().update_empty_.value());
EXPECT_EQ(1U, cluster_->info()->stats().update_empty_.value());
}

TEST_F(RedisClusterTest, Basic) {
Expand Down