Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Unified Diff: webrtc/video/end_to_end_tests.cc

Issue 2998793002: Fix (1) EndToEndTest.InitialProbing and (2) EndToEndTest.TriggerMidCallProbing (Closed)
Patch Set: Rebased Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index ed3ad82fbdc8dfaf044beede68929f1fa32346fe..15db046b80e46c783342db1954a038c645595893 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698