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

Reduce webrtc_perf_tests duration on buildbots

Browse Source 
On buildbots WebRTC-QuickPerfTest field trial is set.
Ensure all FullStackTests don't overwrite this trial and use shorter
timeout in it's presence.

Also, reduce timeouts in the longest CallPerfTests.

Bug: None
Change-Id: If70890f4fe47942b5ea44bfeb26cdc4cee9fa885
Reviewed-on: https://webrtc-review.googlesource.com/c/118923
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26356}
This commit is contained in:
Ilya Nikolaevskiy 2019-01-22 11:12:51 +01:00 committed by Commit Bot
parent 23213d94ff
commit 0500b528a6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
call/call_perf_tests.cc
View File

@ -848,6 +848,7 @@ void CallPerfTest::TestMinAudioVideoBitrate(
static constexpr int kBitrateStabilizationMs = 10000;
static constexpr int kBitrateMeasurements = 10;
static constexpr int kBitrateMeasurementMs = 1000;
static constexpr int kShortDelayMs = 10;
static constexpr int kMinGoodRttMs = 400;
class MinVideoAndAudioBitrateTester : public test::EndToEndTest {
@ -904,6 +905,10 @@ void CallPerfTest::TestMinAudioVideoBitrate(
}
void PerformTest() override {
// Quick test mode, just to exercise all the code paths without actually
// caring about performance measurements.
const bool quick_perf_test =
field_trial::IsEnabled("WebRTC-QuickPerfTest");
int last_passed_test_bitrate = -1;
for (int test_bitrate = test_bitrate_from_;
test_bitrate_from_ < test_bitrate_to_
@ -916,14 +921,14 @@ void CallPerfTest::TestMinAudioVideoBitrate(
receive_simulated_network_->SetConfig(pipe_config);
rtc::ThreadManager::Instance()->CurrentThread()->SleepMs(
kBitrateStabilizationMs);
quick_perf_test ? kShortDelayMs : kBitrateStabilizationMs);
int64_t avg_rtt = 0;
for (int i = 0; i < kBitrateMeasurements; i++) {
Call::Stats call_stats = sender_call_->GetStats();
avg_rtt += call_stats.rtt_ms;
rtc::ThreadManager::Instance()->CurrentThread()->SleepMs(
kBitrateMeasurementMs);
quick_perf_test ? kShortDelayMs : kBitrateMeasurementMs);
}
avg_rtt = avg_rtt / kBitrateMeasurements;
if (avg_rtt > kMinGoodRttMs) {

2
video/full_stack_tests.cc
View File

@ -102,7 +102,7 @@ std::string AppendFieldTrials(std::string new_trial_string) {
class GenericDescriptorTest : public ::testing::TestWithParam<std::string> {
public:
GenericDescriptorTest()
: field_trial_(GetParam()),
: field_trial_(AppendFieldTrials(GetParam())),
generic_descriptor_enabled_(
field_trial::IsEnabled("WebRTC-GenericDescriptor")) {}