admission_control_filter: consume TestUtility::waitForCounterEq retur…

…n value (envoyproxy#34834) add expect_true to waitfor Signed-off-by: Boteng Yao <[email protected]>
fredyw · Jun 21, 2024 · 90c6cfb · 90c6cfb
1 parent 6652b2e
commit 90c6cfb
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/test/extensions/filters/http/admission_control/admission_control_filter_test.cc b/test/extensions/filters/http/admission_control/admission_control_filter_test.cc
@@ -210,7 +210,7 @@ TEST_F(AdmissionControlTest, HttpFailureBehavior) {
   setupFilter(config);
 
   // We expect rejection counter to increment upon failure.
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 
   EXPECT_CALL(controller_, requestCounts()).WillRepeatedly(Return(RequestData(100, 0)));
   EXPECT_CALL(*evaluator_, isHttpSuccess(500)).WillRepeatedly(Return(false));
@@ -221,7 +221,7 @@ TEST_F(AdmissionControlTest, HttpFailureBehavior) {
             filter_->decodeHeaders(request_headers, true));
   sampleHttpRequest("500");
 
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 1, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 1, time_system_));
 }
 
 // Validate simple HTTP success case.
@@ -230,7 +230,7 @@ TEST_F(AdmissionControlTest, HttpSuccessBehavior) {
   setupFilter(config);
 
   // We expect rejection counter to NOT increment upon success.
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 
   EXPECT_CALL(controller_, requestCounts()).WillRepeatedly(Return(RequestData(100, 100)));
   EXPECT_CALL(*evaluator_, isHttpSuccess(200)).WillRepeatedly(Return(true));
@@ -240,15 +240,15 @@ TEST_F(AdmissionControlTest, HttpSuccessBehavior) {
   EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_->decodeHeaders(request_headers, true));
   sampleHttpRequest("200");
 
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 }
 
 // Validate simple gRPC failure case.
 TEST_F(AdmissionControlTest, GrpcFailureBehavior) {
   auto config = makeConfig(default_yaml_);
   setupFilter(config);
 
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 
   EXPECT_CALL(controller_, requestCounts()).WillRepeatedly(Return(RequestData(100, 0)));
   EXPECT_CALL(*evaluator_, isGrpcSuccess(7)).WillRepeatedly(Return(false));
@@ -260,15 +260,15 @@ TEST_F(AdmissionControlTest, GrpcFailureBehavior) {
   sampleGrpcRequest(Grpc::Status::WellKnownGrpcStatus::PermissionDenied);
 
   // We expect rejection counter to increment upon failure.
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 1, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 1, time_system_));
 }
 
 // Validate simple gRPC success case with status in the trailer.
 TEST_F(AdmissionControlTest, GrpcSuccessBehaviorTrailer) {
   auto config = makeConfig(default_yaml_);
   setupFilter(config);
 
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 
   EXPECT_CALL(controller_, requestCounts()).WillRepeatedly(Return(RequestData(100, 100)));
   EXPECT_CALL(*evaluator_, isGrpcSuccess(0)).WillRepeatedly(Return(true));
@@ -279,15 +279,15 @@ TEST_F(AdmissionControlTest, GrpcSuccessBehaviorTrailer) {
   sampleGrpcRequestTrailer(Grpc::Status::WellKnownGrpcStatus::Ok);
 
   // We expect rejection counter to NOT increment upon success.
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 }
 
 // Validate simple gRPC failure case with status in the trailer.
 TEST_F(AdmissionControlTest, GrpcFailureBehaviorTrailer) {
   auto config = makeConfig(default_yaml_);
   setupFilter(config);
 
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 
   EXPECT_CALL(controller_, requestCounts()).WillRepeatedly(Return(RequestData(100, 0)));
   EXPECT_CALL(*evaluator_, isGrpcSuccess(7)).WillRepeatedly(Return(false));
@@ -299,15 +299,15 @@ TEST_F(AdmissionControlTest, GrpcFailureBehaviorTrailer) {
   sampleGrpcRequestTrailer(Grpc::Status::WellKnownGrpcStatus::PermissionDenied);
 
   // We expect rejection counter to increment upon failure.
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 1, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 1, time_system_));
 }
 
 // Validate simple gRPC success case.
 TEST_F(AdmissionControlTest, GrpcSuccessBehavior) {
   auto config = makeConfig(default_yaml_);
   setupFilter(config);
 
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 
   EXPECT_CALL(controller_, requestCounts()).WillRepeatedly(Return(RequestData(100, 100)));
   EXPECT_CALL(*evaluator_, isGrpcSuccess(0)).WillRepeatedly(Return(true));
@@ -318,7 +318,7 @@ TEST_F(AdmissionControlTest, GrpcSuccessBehavior) {
   sampleGrpcRequest(Grpc::Status::WellKnownGrpcStatus::Ok);
 
   // We expect rejection counter to NOT increment upon success.
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 }
 
 // Validate rejection probabilities.
@@ -422,7 +422,7 @@ sampling_window: 10s
   EXPECT_CALL(controller_, averageRps()).WillRepeatedly(Return(100));
 
   // We expect rejection counter to increment upon failure.
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 0, time_system_));
 
   EXPECT_CALL(controller_, requestCounts()).WillRepeatedly(Return(RequestData(100, 0)));
   EXPECT_CALL(*evaluator_, isHttpSuccess(500)).WillRepeatedly(Return(false));
@@ -432,7 +432,7 @@ sampling_window: 10s
             filter_->decodeHeaders(request_headers, true));
   sampleHttpRequest("500");
 
-  TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 1, time_system_);
+  EXPECT_TRUE(TestUtility::waitForCounterEq(store_, "test_prefix.rq_rejected", 1, time_system_));
 }
 
 // Validate max rejection probability.