From 209a44830737f94879295c085bd18b8adcdd502c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Thu, 6 Apr 2023 11:29:55 +0000 Subject: [PATCH] Revert "Don't call EXPECT_TRUE_WAIT recursively." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d0dfe95bf082df7c38b24c8d20da91339f5199e5. Reason for revert: It didn't help Original change's description: > Don't call EXPECT_TRUE_WAIT recursively. > > In case this triggers unexpected error handling on ASAN. > > Bug: webrtc:15018 > Change-Id: Iec8154081f3831ee60902bb94900d79a98ea01fa > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300480 > Reviewed-by: Jeremy Leconte > Commit-Queue: Henrik Boström > Cr-Commit-Position: refs/heads/main@{#39779} Bug: webrtc:15018 Change-Id: I3b6e2434e2c88719ebf9f32c9d9a4dd1c21178a4 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300482 Reviewed-by: Jeremy Leconte Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Commit-Queue: Henrik Boström Cr-Commit-Position: refs/heads/main@{#39781} --- pc/peer_connection_simulcast_unittest.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pc/peer_connection_simulcast_unittest.cc b/pc/peer_connection_simulcast_unittest.cc index f61d1e0687..f975d370c7 100644 --- a/pc/peer_connection_simulcast_unittest.cc +++ b/pc/peer_connection_simulcast_unittest.cc @@ -986,10 +986,7 @@ class PeerConnectionSimulcastWithMediaFlowTests rtc::scoped_refptr pc_wrapper) { auto callback = rtc::make_ref_counted(); pc_wrapper->pc()->GetStats(callback.get()); - while (!callback->called()) { - rtc::Thread::Current()->ProcessMessages(0); - rtc::Thread::Current()->SleepMs(1); - } + EXPECT_TRUE_WAIT(callback->called(), kDefaultTimeout.ms()); return callback->report(); }