Skip to content

Commit

Permalink
Merge pull request #1797 from ctiller/create-pull-request/patch-616dba0
Browse files Browse the repository at this point in the history
Automated fix for refs/heads/shush-connect
  • Loading branch information
ctiller authored Jan 22, 2024
2 parents 616dba0 + 52e9464 commit c67be76
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion test/core/end2end/fuzzers/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ grpc_cc_library(
"fuzzer_input_proto",
"//:chttp2_frame",
"//test/core/event_engine/fuzzing_event_engine",
"//test/core/util:grpc_test_util_base",
"//test/core/util:fuzzing_channel_args",
"//test/core/util:grpc_test_util_base",
],
)

Expand Down
2 changes: 1 addition & 1 deletion test/core/end2end/fuzzers/network_input.cc
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ Duration ScheduleConnection(
.channel_args_preconditioning()
.PreconditionChannelArgs(
CreateChannelArgsFromFuzzingConfiguration(
network_input.endpoint_config(), std::move(environment))
network_input.endpoint_config(), environment)
.ToC()
.get());
auto schedule = MakeSchedule(network_input);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ class FuzzingEventEngine : public EventEngine {
// each test.
void UnsetGlobalHooks() ABSL_LOCKS_EXCLUDED(mu_);

Duration max_delay_write() const { return max_delay_[static_cast<int>(RunType::kWrite)]; }
Duration max_delay_write() const {
return max_delay_[static_cast<int>(RunType::kWrite)];
}

private:
enum class RunType {
Expand Down Expand Up @@ -269,8 +271,8 @@ class FuzzingEventEngine : public EventEngine {
ABSL_LOCKS_EXCLUDED(mu_);

static grpc_core::NoDestruct<grpc_core::Mutex> mu_;
static grpc_core::NoDestruct<grpc_core::Mutex> now_mu_ ABSL_ACQUIRED_AFTER(
mu_);
static grpc_core::NoDestruct<grpc_core::Mutex> now_mu_
ABSL_ACQUIRED_AFTER(mu_);

Duration exponential_gate_time_increment_ ABSL_GUARDED_BY(mu_) =
std::chrono::milliseconds(1);
Expand Down

0 comments on commit c67be76

Please sign in to comment.