From af18b7a0cdb9ce9605bf19ea9daeb3f424e03e30 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 7 Jun 2024 08:56:10 -0700 Subject: [PATCH] fix --- test/core/call/client_call_test.cc | 5 ++++- test/core/call/yodel/fuzzer_main.cc | 1 + test/core/call/yodel/test_main.cc | 1 + test/core/call/yodel/yodel_test.cc | 2 ++ test/core/call/yodel/yodel_test.h | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/test/core/call/client_call_test.cc b/test/core/call/client_call_test.cc index 537e0b48db6..27ef9cee212 100644 --- a/test/core/call/client_call_test.cc +++ b/test/core/call/client_call_test.cc @@ -98,7 +98,10 @@ class ClientCallTest : public YodelTest { return; } expectations_ = 0; - cq_verifier_->Verify(timeout.value_or(Duration::Seconds(10)), whence); + cq_verifier_->Verify( + timeout.value_or(g_yodel_fuzzing ? Duration::Minutes(5) + : Duration::Seconds(10)), + whence); } CallHandler& handler() { diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc index 8eb9502a963..85e9c80bcf7 100644 --- a/test/core/call/yodel/fuzzer_main.cc +++ b/test/core/call/yodel/fuzzer_main.cc @@ -36,6 +36,7 @@ bool squelch = true; static void dont_log(gpr_log_func_args* /*args*/) {} DEFINE_PROTO_FUZZER(const transport_test_suite::Msg& msg) { + grpc_core::g_yodel_fuzzing = true; static const grpc_core::NoDestruct< std::vector> tests{grpc_core::yodel_detail::TestRegistry::AllTests()}; diff --git a/test/core/call/yodel/test_main.cc b/test/core/call/yodel/test_main.cc index 40066c94851..22b1ff3d561 100644 --- a/test/core/call/yodel/test_main.cc +++ b/test/core/call/yodel/test_main.cc @@ -19,6 +19,7 @@ #include "test/core/test_util/test_config.h" int main(int argc, char** argv) { + grpc_core::g_yodel_fuzzing = false; grpc::testing::TestEnvironment env(&argc, argv); absl::BitGen bitgen; ::testing::InitGoogleTest(&argc, argv); diff --git a/test/core/call/yodel/yodel_test.cc b/test/core/call/yodel/yodel_test.cc index 5625aeefe54..e60b357625f 100644 --- a/test/core/call/yodel/yodel_test.cc +++ b/test/core/call/yodel/yodel_test.cc @@ -27,6 +27,8 @@ namespace grpc_core { +bool g_yodel_fuzzing; + namespace yodel_detail { TestRegistry* TestRegistry::root_ = nullptr; diff --git a/test/core/call/yodel/yodel_test.h b/test/core/call/yodel/yodel_test.h index a961ad41cb1..ef34757f986 100644 --- a/test/core/call/yodel/yodel_test.h +++ b/test/core/call/yodel/yodel_test.h @@ -37,6 +37,8 @@ namespace grpc_core { class YodelTest; +extern bool g_yodel_fuzzing; + namespace yodel_detail { // Capture the name and location of a test step.