From 87c42aab68c817e5a9240ce7fabf2cfc7362cd85 Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Tue, 7 May 2024 11:43:06 -0700
Subject: [PATCH] [test] Wait for EE to quiesce in RLSEnd2endTest teardown
 (#36553)

Closes #36553

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36553 from drfloob:cleaner-RlsEnd2endTest-shutdown f16b5aac3e5f73154a7944791de61dc050f05ec3
PiperOrigin-RevId: 631496415
---
 CMakeLists.txt                       | 1 +
 build_autogenerated.yaml             | 2 ++
 test/cpp/end2end/BUILD               | 1 +
 test/cpp/end2end/rls_end2end_test.cc | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6e292b0373..787db67baa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26337,6 +26337,7 @@ add_executable(rls_end2end_test
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
+  test/core/event_engine/event_engine_test_utils.cc
   test/core/test_util/fake_stats_plugin.cc
   test/core/test_util/test_lb_policies.cc
   test/cpp/end2end/rls_end2end_test.cc
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 7e4f95f2932..dd845a6d959 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -17596,6 +17596,7 @@ targets:
   run: false
   language: c++
   headers:
+  - test/core/event_engine/event_engine_test_utils.h
   - test/core/test_util/fake_stats_plugin.h
   - test/core/test_util/test_lb_policies.h
   - test/cpp/end2end/counted_service.h
@@ -17608,6 +17609,7 @@ targets:
   - src/proto/grpc/testing/echo_messages.proto
   - src/proto/grpc/testing/simple_messages.proto
   - src/proto/grpc/testing/xds/v3/orca_load_report.proto
+  - test/core/event_engine/event_engine_test_utils.cc
   - test/core/test_util/fake_stats_plugin.cc
   - test/core/test_util/test_lb_policies.cc
   - test/cpp/end2end/rls_end2end_test.cc
diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD
index 4e0b8ed3e55..3e01fe662f9 100644
--- a/test/cpp/end2end/BUILD
+++ b/test/cpp/end2end/BUILD
@@ -584,6 +584,7 @@ grpc_cc_test(
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",
         "//src/proto/grpc/testing/duplicate:echo_duplicate_proto",
+        "//test/core/event_engine:event_engine_test_utils",
         "//test/core/test_util:fake_stats_plugin",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:test_lb_policies",
diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc
index 5eb5e41ac3e..189c4c2d34c 100644
--- a/test/cpp/end2end/rls_end2end_test.cc
+++ b/test/cpp/end2end/rls_end2end_test.cc
@@ -58,6 +58,7 @@
 #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h"
 #include "src/proto/grpc/lookup/v1/rls.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
+#include "test/core/event_engine/event_engine_test_utils.h"
 #include "test/core/test_util/fake_stats_plugin.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/resolve_localhost_ip46.h"
@@ -175,6 +176,8 @@ class RlsEnd2endTest : public ::testing::Test {
 
   static void TearDownTestSuite() {
     grpc_shutdown_blocking();
+    WaitForSingleOwner(
+        grpc_event_engine::experimental::GetDefaultEventEngine());
     grpc_core::CoreConfiguration::Reset();
   }