|
|
@ -84,6 +84,13 @@ void CoreEnd2endTest::SetUp() { |
|
|
|
|
|
|
|
|
|
|
|
void CoreEnd2endTest::TearDown() { |
|
|
|
void CoreEnd2endTest::TearDown() { |
|
|
|
const bool do_shutdown = fixture_ != nullptr; |
|
|
|
const bool do_shutdown = fixture_ != nullptr; |
|
|
|
|
|
|
|
std::shared_ptr<grpc_event_engine::experimental::EventEngine> ee; |
|
|
|
|
|
|
|
// TODO(hork): locate the windows leak so we can enable end2end experiments.
|
|
|
|
|
|
|
|
#ifndef GPR_WINDOWS |
|
|
|
|
|
|
|
if (grpc_is_initialized()) { |
|
|
|
|
|
|
|
ee = grpc_event_engine::experimental::GetDefaultEventEngine(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
#endif |
|
|
|
ShutdownAndDestroyClient(); |
|
|
|
ShutdownAndDestroyClient(); |
|
|
|
ShutdownAndDestroyServer(); |
|
|
|
ShutdownAndDestroyServer(); |
|
|
|
cq_verifier_.reset(); |
|
|
|
cq_verifier_.reset(); |
|
|
@ -98,15 +105,11 @@ void CoreEnd2endTest::TearDown() { |
|
|
|
cq_ = nullptr; |
|
|
|
cq_ = nullptr; |
|
|
|
} |
|
|
|
} |
|
|
|
fixture_.reset(); |
|
|
|
fixture_.reset(); |
|
|
|
// TODO(hork): locate the windows leak so we can enable end2end experiments.
|
|
|
|
|
|
|
|
#ifndef GPR_WINDOWS |
|
|
|
|
|
|
|
// Creating an EventEngine requires gRPC initialization, which the NoOp test
|
|
|
|
// Creating an EventEngine requires gRPC initialization, which the NoOp test
|
|
|
|
// does not do. Skip the EventEngine check if unnecessary.
|
|
|
|
// does not do. Skip the EventEngine check if unnecessary.
|
|
|
|
if (grpc_is_initialized()) { |
|
|
|
if (ee != nullptr) { |
|
|
|
quiesce_event_engine_( |
|
|
|
quiesce_event_engine_(std::move(ee)); |
|
|
|
grpc_event_engine::experimental::GetDefaultEventEngine()); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
#endif |
|
|
|
|
|
|
|
if (do_shutdown) { |
|
|
|
if (do_shutdown) { |
|
|
|
grpc_shutdown_blocking(); |
|
|
|
grpc_shutdown_blocking(); |
|
|
|
// This will wait until gRPC shutdown has actually happened to make sure
|
|
|
|
// This will wait until gRPC shutdown has actually happened to make sure
|
|
|
|