Merge pull request #24568 from veblush/test-xds-abseil

Enable XdsRoutingApplyXdsTimeout again under TSAN
4 years ago · 9083de5017
parent 913760a6a9 dc9ef8fc39
commit 9083de5017
1 changed files with 0 additions and 3 deletions
--- a/test/cpp/end2end/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds_end2end_test.cc
@ -4245,9 +4245,6 @@ TEST_P(LdsRdsTest, XdsRoutingClusterUpdateClustersWithPickingDelays) {
 }

 TEST_P(LdsRdsTest, XdsRoutingApplyXdsTimeout) {
-  // TODO(https://github.com/grpc/grpc/issues/24549): TSAN won't work here.
-  if (BuiltUnderTsan()) return;
-
  const int64_t kTimeoutNano = 500000000;
  const int64_t kTimeoutGrpcTimeoutHeaderMaxSecond = 1;
  const int64_t kTimeoutMaxStreamDurationSecond = 2;