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

Fix (1) EndToEndTest.InitialProbing and (2) EndToEndTest.TriggerMidCallProbing

Browse Source 
* EndToEndTest.InitialProbing had an uninitialized boolean.
* Both tests used RTC_DCHECK where one would normally expect an RTC_DCHECK.

BUG=webrtc:8085

Review-Url: https://codereview.webrtc.org/2998793002
Cr-Commit-Position: refs/heads/master@{#19309}
This commit is contained in:
eladalon 2017-08-10 10:42:53 -07:00 committed by Commit Bot
parent 3bf97cf060
commit cf038f7eb6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/video/end_to_end_tests.cc
View File

@ -2380,7 +2380,9 @@ TEST_F(EndToEndTest, MAYBE_InitialProbing) {
class InitialProbingTest : public ProbingTest {
public:
explicit InitialProbingTest(bool* success)
: ProbingTest(300000), success_(success) {}
: ProbingTest(300000), success_(success) {
*success_ = false;
}
void PerformTest() override {
int64_t start_time_ms = clock_->TimeInMilliseconds();
@ -2403,7 +2405,7 @@ TEST_F(EndToEndTest, MAYBE_InitialProbing) {
bool* const success_;
};
bool success;
bool success = false;
const int kMaxAttempts = 3;
for (int i = 0; i < kMaxAttempts; ++i) {
InitialProbingTest test(&success);
@ -2411,8 +2413,8 @@ TEST_F(EndToEndTest, MAYBE_InitialProbing) {
if (success)
return;
}
RTC_DCHECK(success) << "Failed to perform mid initial probing ("
<< kMaxAttempts << " attempts).";
EXPECT_TRUE(success) << "Failed to perform mid initial probing ("
<< kMaxAttempts << " attempts).";
}
// Fails on Linux MSan: bugs.webrtc.org/7428
@ -2474,7 +2476,7 @@ TEST_F(EndToEndTest, TriggerMidCallProbing) {
bool* const success_;
};
bool success;
bool success = false;
const int kMaxAttempts = 3;
for (int i = 0; i < kMaxAttempts; ++i) {
TriggerMidCallProbingTest test(&success);