tests working

markdroth · Sep 11, 2023 · 16f1674 · 16f1674
1 parent 260c8c2
commit 16f1674
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 28 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
diff --git a/test/core/client_channel/lb_policy/BUILD b/test/core/client_channel/lb_policy/BUILD
@@ -34,7 +34,7 @@ grpc_cc_library(
     deps = [
         "//src/core:lb_policy",
         "//src/core:subchannel_interface",
-        "//test/core/event_engine:mock_event_engine",
+        "//test/core/event_engine/fuzzing_event_engine",
     ],
 )
 

diff --git a/test/core/client_channel/lb_policy/lb_policy_test_lib.h b/test/core/client_channel/lb_policy/lb_policy_test_lib.h
@@ -1175,28 +1175,29 @@ class LoadBalancingPolicyTest : public ::testing::Test {
 class TimeAwareLoadBalancingPolicyTest : public LoadBalancingPolicyTest {
  protected:
   TimeAwareLoadBalancingPolicyTest() {
-    auto fuzzing_ee =
+    event_engine_ =
         std::make_shared<grpc_event_engine::experimental::FuzzingEventEngine>(
             grpc_event_engine::experimental::FuzzingEventEngine::Options(),
             fuzzing_event_engine::Actions());
-    // Store in base class, to make it visible to the LB policy.
-    event_engine_ = std::move(mock_ee);
   }
 
   ~TimeAwareLoadBalancingPolicyTest() override {
-    EXPECT_TRUE(timer_callbacks_.empty())
-        << "WARNING: Test did not run all timer callbacks";
+    auto* fuzzing_ee =
+        static_cast<grpc_event_engine::experimental::FuzzingEventEngine*>(
+            event_engine_.get());
+    fuzzing_ee->FuzzingDone();
   }
 
-  void IncrementTime() {
+  void IncrementTimeBy(Duration duration) {
     auto* fuzzing_ee =
         static_cast<grpc_event_engine::experimental::FuzzingEventEngine*>(
             event_engine_.get());
-    fuzzing_ee->Tick();
+    fuzzing_ee->TickForDuration(duration);
     // Flush WorkSerializer, in case the timer callback enqueued anything.
     WaitForWorkSerializerToFlush();
   }
 
+// FIXME
   // Called when the LB policy starts a timer.
   // May be overridden by subclasses.
   virtual void CheckExpectedTimerDuration(

diff --git a/test/core/client_channel/lb_policy/outlier_detection_test.cc b/test/core/client_channel/lb_policy/outlier_detection_test.cc
@@ -226,8 +226,7 @@ TEST_F(OutlierDetectionTest, FailurePercentage) {
   ASSERT_TRUE(address.has_value());
   gpr_log(GPR_INFO, "### failed RPC on %s", address->c_str());
   // Advance time and run the timer callback to trigger ejection.
-  time_cache_.IncrementBy(Duration::Seconds(10));
-  RunTimerCallback();
+  IncrementTimeBy(Duration::Seconds(10));
   gpr_log(GPR_INFO, "### ejection complete");
   // Expect a re-resolution request.
   ExpectReresolutionRequest();
@@ -279,8 +278,7 @@ TEST_F(OutlierDetectionTest, DoesNotWorkWithPickFirst) {
   ASSERT_TRUE(address.has_value());
   gpr_log(GPR_INFO, "### failed RPC on %s", address->c_str());
   // Advance time and run the timer callback to trigger ejection.
-  time_cache_.IncrementBy(Duration::Seconds(10));
-  RunTimerCallback();
+  IncrementTimeBy(Duration::Seconds(10));
   gpr_log(GPR_INFO, "### ejection timer pass complete");
   // Subchannel should not be ejected.
   ExpectQueueEmpty();

diff --git a/test/core/client_channel/lb_policy/weighted_round_robin_test.cc b/test/core/client_channel/lb_policy/weighted_round_robin_test.cc
@@ -311,9 +311,8 @@ class WeightedRoundRobinTest : public TimeAwareLoadBalancingPolicyTest {
         if (*picker == nullptr) return false;
       } else if (run_timer_callbacks) {
         gpr_log(GPR_INFO, "running timer callback...");
-        RunTimerCallback();
-        // Increment time.
-        time_cache_.IncrementBy(Duration::Seconds(1));
+        // Increment time and run any timer callbacks.
+        IncrementTimeBy(Duration::Seconds(1));
       }
     }
   }
@@ -697,8 +696,7 @@ TEST_F(WeightedRoundRobinTest, WeightExpirationPeriod) {
       {{kAddresses[0], 1}, {kAddresses[1], 3}, {kAddresses[2], 3}});
   // Advance time to make weights stale and trigger the timer callback
   // to recompute weights.
-  time_cache_.IncrementBy(Duration::Seconds(2));
-  RunTimerCallback();
+  IncrementTimeBy(Duration::Seconds(2));
   // Picker should now be falling back to round-robin.
   ExpectWeightedRoundRobinPicks(
       picker.get(), {},
@@ -725,8 +723,7 @@ TEST_F(WeightedRoundRobinTest, BlackoutPeriodAfterWeightExpiration) {
       {{kAddresses[0], 1}, {kAddresses[1], 3}, {kAddresses[2], 3}});
   // Advance time to make weights stale and trigger the timer callback
   // to recompute weights.
-  time_cache_.IncrementBy(Duration::Seconds(2));
-  RunTimerCallback();
+  IncrementTimeBy(Duration::Seconds(2));
   // Picker should now be falling back to round-robin.
   ExpectWeightedRoundRobinPicks(
       picker.get(), {},
@@ -744,8 +741,7 @@ TEST_F(WeightedRoundRobinTest, BlackoutPeriodAfterWeightExpiration) {
       {{kAddresses[0], 3}, {kAddresses[1], 3}, {kAddresses[2], 3}});
   // Advance time past the blackout period.  This should cause the
   // weights to be used.
-  time_cache_.IncrementBy(Duration::Seconds(1));
-  RunTimerCallback();
+  IncrementTimeBy(Duration::Seconds(1));
   ExpectWeightedRoundRobinPicks(
       picker.get(), {},
       {{kAddresses[0], 3}, {kAddresses[1], 3}, {kAddresses[2], 1}});
@@ -791,8 +787,7 @@ TEST_F(WeightedRoundRobinTest, BlackoutPeriodAfterDisconnect) {
       {{kAddresses[0], 1}, {kAddresses[1], 3}, {kAddresses[2], 2}});
   // Advance time to exceed the blackout period and trigger the timer
   // callback to recompute weights.
-  time_cache_.IncrementBy(Duration::Seconds(1));
-  RunTimerCallback();
+  IncrementTimeBy(Duration::Seconds(1));
   ExpectWeightedRoundRobinPicks(
       picker.get(),
       {{kAddresses[0], MakeBackendMetricData(/*app_utilization=*/0.3,