zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NetworkEmulationManagerTest.ThroughputStats flakiness.

Browse Source 
Account for time measurement variability.

Bug: webrtc:10553
Change-Id: I7a82a15d5a7c2fb3e5cb80bfdf140433a3b93349
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/151780
Commit-Queue: Yves Gerey <yvesg@google.com>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29101}
This commit is contained in:
Yves Gerey
2019-09-06 16:35:20 +02:00
committed by Commit Bot
parent e611f19c32
commit b64d65e67b
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/network/network_emulation_unittest.cc
View File

@ -20,7 +20,6 @@
#include "call/simulated_network.h"
#include "rtc_base/event.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
#include "system_wrappers/include/sleep.h"
#include "test/gmock.h"
#include "test/gtest.h"
@ -298,22 +297,26 @@ TEST(NetworkEmulationManagerTest, ThroughputStats) {
s1->Connect(s2->GetLocalAddress());
s2->Connect(s1->GetLocalAddress());
// Send 10 packets for 1
// Send 11 packets, totalizing 1 second between the first and the last.
const int kNumPacketsSent = 11;
const int kDelayMs = 100;
rtc::Event wait;
for (uint64_t i = 0; i < 11; i++) {
for (int i = 0; i < kNumPacketsSent; i++) {
nt1->network_thread()->PostTask(
RTC_FROM_HERE, [&]() { s1->Send(data.data(), data.size()); });
nt2->network_thread()->PostTask(
RTC_FROM_HERE, [&]() { s2->Send(data.data(), data.size()); });
wait.Wait(100);
wait.Wait(kDelayMs);
}
std::atomic<int> received_stats_count{0};
nt1->GetStats([&](EmulatedNetworkStats st) {
EXPECT_EQ(st.packets_sent, 11l);
EXPECT_EQ(st.bytes_sent.bytes(), single_packet_size * 11l);
EXPECT_EQ(st.packets_sent, kNumPacketsSent);
EXPECT_EQ(st.bytes_sent.bytes(), single_packet_size * kNumPacketsSent);
const double tolerance = 0.99; // Accept 1% tolerance for timing.
EXPECT_GE(st.last_packet_sent_time - st.first_packet_sent_time,
TimeDelta::seconds(1));
TimeDelta::ms((kNumPacketsSent - 1) * kDelayMs * tolerance));
EXPECT_GT(st.AverageSendRate().bps(), 0);
received_stats_count++;
});