From 2ad3c0a0417e80fc3b6a3eace22d2fda295a3788 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 28 Oct 2020 15:22:20 -0700 Subject: [PATCH] Revert "Merge pull request #24568 from veblush/test-xds-abseil" This reverts commit 9083de501749d3b543c4258817ee9445827ee5f8, reversing changes made to 913760a6a9357823ffe73bc4a81ef06c4fdb5c7f. --- test/cpp/end2end/xds_end2end_test.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/cpp/end2end/xds_end2end_test.cc b/test/cpp/end2end/xds_end2end_test.cc index 734fa6da4de..ab2b8590073 100644 --- 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;