Revert "event: fix DispatcherImplTest::InitializeStats flake (#6619)"

This reverts commit bad70bf. Signed-off-by: Matt Klein <mklein@lyft.com>
envoyproxy · Apr 18, 2019 · 088ac4c · 088ac4c
1 parent 4f105f5
commit 088ac4c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/test/common/event/dispatcher_impl_test.cc b/test/common/event/dispatcher_impl_test.cc
@@ -85,7 +85,6 @@ class DispatcherImplTest : public testing::Test {
     dispatcher_thread_->join();
   }
 
-  NiceMock<Stats::MockStore> scope_; // Used in InitializeStats, must outlive dispatcher_->exit().
   Api::ApiPtr api_;
   Thread::ThreadPtr dispatcher_thread_;
   DispatcherPtr dispatcher_;
@@ -97,9 +96,11 @@ class DispatcherImplTest : public testing::Test {
 };
 
 TEST_F(DispatcherImplTest, InitializeStats) {
-  EXPECT_CALL(scope_, histogram("test.dispatcher.loop_duration_us"));
-  EXPECT_CALL(scope_, histogram("test.dispatcher.poll_delay_us"));
-  dispatcher_->initializeStats(scope_, "test.");
+  // NiceMock because deliverHistogramToSinks may or may not be called, depending on timing.
+  NiceMock<Stats::MockStore> scope;
+  EXPECT_CALL(scope, histogram("test.dispatcher.loop_duration_us"));
+  EXPECT_CALL(scope, histogram("test.dispatcher.poll_delay_us"));
+  dispatcher_->initializeStats(scope, "test.");
 }
 
 TEST_F(DispatcherImplTest, Post) {