admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tsan issue with PeerConnectionCongestionControlTest.

Browse Source 
https://ci.chromium.org/ui/p/webrtc/builders/ci/Linux%20Tsan%20v2/34967/overview

Change-Id: I88b68a0513af211d878f08aec8dd24b72b729db4
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/371460
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43559}
This commit is contained in:
Jeremy Leconte 2024-12-13 11:41:07 +01:00 committed by WebRTC LUCI CQ
parent 29a3f928f9
commit 90e080d075
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pc/congestion_control_integrationtest.cc
View File

@ -42,6 +42,9 @@ TEST_F(PeerConnectionCongestionControlTest, OfferContainsCcfbIfEnabled) {
auto offer = caller()->CreateOfferAndWait();
std::string offer_str = absl::StrCat(*offer);
EXPECT_THAT(offer_str, HasSubstr("a=rtcp-fb:* ack ccfb\r\n"));
// Closing peer connections before ScopedFieldTrials gets out of scope to
// avoid a race condition.
ClosePeerConnections();
}
TEST_F(PeerConnectionCongestionControlTest, ReceiveOfferSetsCcfbFlag) {
@ -69,6 +72,9 @@ TEST_F(PeerConnectionCongestionControlTest, ReceiveOfferSetsCcfbFlag) {
// Check that the answer does not contain transport-cc
std::string answer_str = absl::StrCat(*caller()->pc()->remote_description());
EXPECT_THAT(answer_str, Not(HasSubstr("transport-cc")));
// Closing peer connections before ScopedFieldTrials gets out of scope to
// avoid a race condition.
ClosePeerConnections();
}
TEST_F(PeerConnectionCongestionControlTest, CcfbGetsUsed) {
@ -89,6 +95,9 @@ TEST_F(PeerConnectionCongestionControlTest, CcfbGetsUsed) {
// There should be no transport-cc generated.
EXPECT_THAT(pc_internal->FeedbackAccordingToTransportCcCountForTesting(),
Eq(0));
// Closing peer connections before ScopedFieldTrials gets out of scope to
// avoid a race condition.
ClosePeerConnections();
}
TEST_F(PeerConnectionCongestionControlTest, TransportCcGetsUsed) {
@ -109,6 +118,9 @@ TEST_F(PeerConnectionCongestionControlTest, TransportCcGetsUsed) {
kDefaultTimeout);
// Test that RFC 8888 feedback is NOT generated when field trial disabled.
EXPECT_THAT(pc_internal->FeedbackAccordingToRfc8888CountForTesting(), Eq(0));
// Closing peer connections before ScopedFieldTrials gets out of scope to
// avoid a race condition.
ClosePeerConnections();
}
} // namespace webrtc