From 5a7bab734f8758fedbd9f080dc7553edb2ae4421 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Thu, 15 Aug 2019 17:05:02 -0700 Subject: [PATCH] redis: fix merge race (#7943) Signed-off-by: Lizan Zhou --- test/extensions/clusters/redis/redis_cluster_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/extensions/clusters/redis/redis_cluster_test.cc b/test/extensions/clusters/redis/redis_cluster_test.cc index d3af8ce09dcc..7d6a4967cc8a 100644 --- a/test/extensions/clusters/redis/redis_cluster_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_test.cc @@ -473,7 +473,7 @@ class RedisClusterTest : public testing::Test, // No change. expectRedisResolve(); - resolve_timer_->callback_(); + resolve_timer_->invokeCallback(); EXPECT_CALL(*cluster_callback_, onClusterSlotUpdate(_, _)).Times(1).WillOnce(Return(false)); expectClusterSlotResponse(twoSlotsMastersWithReplica()); expectHealthyHosts(std::list( @@ -482,7 +482,7 @@ class RedisClusterTest : public testing::Test, // Remove 2nd shard. expectRedisResolve(); EXPECT_CALL(membership_updated_, ready()); - resolve_timer_->callback_(); + resolve_timer_->invokeCallback(); EXPECT_CALL(*cluster_callback_, onClusterSlotUpdate(_, _)).Times(1); expectClusterSlotResponse(singleSlotMasterReplica("127.0.0.1", "127.0.0.2", 22120)); expectHealthyHosts(std::list({"127.0.0.1:22120", "127.0.0.2:22120"})); @@ -819,7 +819,7 @@ TEST_F(RedisClusterTest, RedisReplicaErrorResponse) { for (uint64_t i = 1; i < (1 << 3); i++) { std::bitset<3> replica_flags(i); expectRedisResolve(); - resolve_timer_->callback_(); + resolve_timer_->invokeCallback(); if (replica_flags.all()) { EXPECT_CALL(membership_updated_, ready()); EXPECT_CALL(*cluster_callback_, onClusterSlotUpdate(_, _)).Times(1).WillOnce(Return(false));