From c9946c21838e86359b0cc1ad6fb497d97b564016 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Wed, 9 Mar 2022 17:04:39 -0800
Subject: [PATCH] Channelz Service Test Shutdown (#29068)

---
 test/cpp/end2end/channelz_service_test.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc
index 56817b1b27d..cf09d2f3101 100644
--- a/test/cpp/end2end/channelz_service_test.cc
+++ b/test/cpp/end2end/channelz_service_test.cc
@@ -213,6 +213,13 @@ class ChannelzServerTest : public ::testing::TestWithParam<CredentialsType> {
     proxy_server_ = proxy_builder.BuildAndStart();
   }
 
+  void TearDown() override {
+    for (auto& backend : backends_) {
+      backend.server->Shutdown(grpc_timeout_milliseconds_to_deadline(0));
+    }
+    proxy_server_->Shutdown(grpc_timeout_milliseconds_to_deadline(0));
+  }
+
   // Sets the proxy up to have an arbitrary number of backends.
   void ConfigureProxy(size_t num_backends) {
     backends_.resize(num_backends);