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

webrtc/video/end_to_end_tests.cc

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 394abe855289d4354902caf35f34d961af126bc1..3234db8ae03117b40f8f85b0c69b48e880b2ecf3 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -2306,7 +2306,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;

[eladalon, 2017/08/10 15:07:21]

This line was missing from this test, though not from the next one.

+    }
 
     void PerformTest() override {
       int64_t start_time_ms = clock_->TimeInMilliseconds();
@@ -2329,7 +2331,7 @@ TEST_F(EndToEndTest, MAYBE_InitialProbing) {
     bool* const success_;
   };
 
-  bool success;
+  bool success = false;

[eladalon, 2017/08/10 15:07:21]

This is not strictly necessary, because it happens in the ctor, but it avoids
giving the reader a small heart-attack before he sees the ctor.

   const int kMaxAttempts = 3;
   for (int i = 0; i < kMaxAttempts; ++i) {
     InitialProbingTest test(&success);
@@ -2337,8 +2339,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
@@ -2400,7 +2402,7 @@ TEST_F(EndToEndTest, TriggerMidCallProbing) {
     bool* const success_;
   };
 
-  bool success;
+  bool success = false;

[eladalon, 2017/08/10 15:07:21]

This is not strictly necessary, because it happens in the ctor, but it avoids
giving the reader a small heart-attack before he sees the ctor.

   const int kMaxAttempts = 3;
   for (int i = 0; i < kMaxAttempts; ++i) {
     TriggerMidCallProbingTest test(&success);
@@ -2408,8 +2410,8 @@ TEST_F(EndToEndTest, TriggerMidCallProbing) {
     if (success)
       return;
   }
-  RTC_DCHECK(success) << "Failed to perform mid call probing (" << kMaxAttempts
-                      << " attempts).";
+  EXPECT_TRUE(success) << "Failed to perform mid call probing (" << kMaxAttempts
+                       << " attempts).";
 }
 
 TEST_F(EndToEndTest, VerifyNackStats) {