test cleanup to avoid tsan

Signed-off-by: Adi Suissa-Peleg <[email protected]>
adisuissa · Oct 23, 2024 · 4168430 · 4168430
1 parent 0e33485
commit 4168430
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/test/integration/ads_integration_test.cc b/test/integration/ads_integration_test.cc
@@ -2838,6 +2838,22 @@ class AdsReplacementIntegrationTest : public AdsIntegrationTest {
     }
   }
 
+  void cleanUpSecondXdsConnection() {
+    // Cleanup the second xds connection if used.
+    if (second_xds_connection_ != nullptr) {
+      AssertionResult result = second_xds_connection_->close();
+      RELEASE_ASSERT(result, result.message());
+      result = second_xds_connection_->waitForDisconnect();
+      RELEASE_ASSERT(result, result.message());
+      second_xds_connection_.reset();
+    }
+  }
+
+  void TearDown() override {
+    cleanUpSecondXdsConnection();
+    AdsIntegrationTest::TearDown();
+  }
+
   // Second ADS stream.
   FakeUpstream* second_xds_upstream_{};
   FakeHttpConnectionPtr second_xds_connection_;