Merge pull request #24598 from grpc/rollback_24568

Revert "Merge pull request #24568 from veblush/test-xds-abseil"
4 years ago · 486989f250
parent 761ce6ee64 2ad3c0a041
commit 486989f250
1 changed files with 3 additions and 0 deletions
--- a/test/cpp/end2end/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds_end2end_test.cc
@ -4245,6 +4245,9 @@ 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;