From f9b6e5e4b544d235f4730644cd5641ef451cdd53 Mon Sep 17 00:00:00 2001 From: Stefan Holmer Date: Mon, 6 Feb 2017 17:17:57 +0100 Subject: [PATCH] Fix KeepsHighBitrateWhenReconfiguringSender to avoid flakiness if probing succeeds in between encoder reconfigurations. BUG=webrtc:7111 R=brandtr@webrtc.org Review-Url: https://codereview.webrtc.org/2676973004 . Cr-Commit-Position: refs/heads/master@{#16454} --- webrtc/call/call_perf_tests.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc index b6a8fe6047..e52d967ed4 100644 --- a/webrtc/call/call_perf_tests.cc +++ b/webrtc/call/call_perf_tests.cc @@ -663,8 +663,9 @@ TEST_F(CallPerfTest, KeepsHighBitrateWhenReconfiguringSender) { EXPECT_EQ(2 * kDefaultWidth, config->width); EXPECT_EQ(2 * kDefaultHeight, config->height); EXPECT_GE(last_set_bitrate_kbps_, kReconfigureThresholdKbps); - EXPECT_NEAR(config->startBitrate, last_set_bitrate_kbps_, - kPermittedReconfiguredBitrateDiffKbps) + EXPECT_GT( + config->startBitrate, + last_set_bitrate_kbps_ - kPermittedReconfiguredBitrateDiffKbps) << "Encoder reconfigured with bitrate too far away from last set."; observation_complete_.Set(); }