Reduce flakyness of timing dependent tests for TestFrameBuffer2.*.

webrtc/modules/video_coding/frame_buffer2_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 170 matching lines @@
   bool tear_down_;
   rtc::PlatformThread extract_thread_;
   rtc::Event trigger_extract_event_;
   rtc::Event crit_acquired_event_;
   rtc::CriticalSection crit_;
 };
 
 TEST_F(TestFrameBuffer2, ExtractFromEmptyBuffer) {
   ExtractFrame();
   CheckNoFrame(0);
 }

[stefan-webrtc, 2016/05/19 13:02:55]

Maybe move this down so all non timing dependent tests are kept separate.

 
+// Following tests are timing dependent. Either the timeouts have to
+// be increased by a large margin, which would slow down all trybots,
+// or we disable them for the very slow ones, like we do here.
+#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER)
 TEST_F(TestFrameBuffer2, WaitForFrame) {
   uint16_t pid = Rand();
   uint32_t ts = Rand();
 
-  ExtractFrame(20);
+  ExtractFrame(50);
   InsertFrame(pid, 0, ts, false);
   CheckFrame(0, pid, 0);
 }
 
 TEST_F(TestFrameBuffer2, OneSuperFrame) {
   uint16_t pid = Rand();
   uint32_t ts = Rand();
 
-  ExtractFrame(20);
+  ExtractFrame(50);
   InsertFrame(pid, 1, ts, true);
   InsertFrame(pid, 0, ts, false);
   ExtractFrame();
 
   CheckFrame(0, pid, 0);
   CheckFrame(1, pid, 1);
 }
 
+TEST_F(TestFrameBuffer2, OneLayerStreamReordered) {
+  uint16_t pid = Rand();
+  uint32_t ts = Rand();
+
+  InsertFrame(pid, 0, ts, false);
+  ExtractFrame();
+  CheckFrame(0, pid, 0);
+  for (int i = 1; i < 10; i += 2) {
+    ExtractFrame(50);
+    InsertFrame(pid + i + 1, 0, ts + (i + 1) * kFps10, false, pid + i);
+    clock_.AdvanceTimeMilliseconds(kFps10);
+    InsertFrame(pid + i, 0, ts + i * kFps10, false, pid + i - 1);
+    clock_.AdvanceTimeMilliseconds(kFps10);
+    ExtractFrame();
+    CheckFrame(i, pid + i, 0);
+    CheckFrame(i + 1, pid + i + 1, 0);
+  }
+}
+#endif
+
 TEST_F(TestFrameBuffer2, OneLayerStream) {
   uint16_t pid = Rand();
   uint32_t ts = Rand();
 
   InsertFrame(pid, 0, ts, false);
   ExtractFrame();
   CheckFrame(0, pid, 0);
   for (int i = 1; i < 10; ++i) {
     InsertFrame(pid + i, 0, ts + i * kFps10, false, pid + i - 1);
     ExtractFrame();
     clock_.AdvanceTimeMilliseconds(kFps10);
     CheckFrame(i, pid + i, 0);
   }
 }
 
-TEST_F(TestFrameBuffer2, OneLayerStreamReordered) {
-  uint16_t pid = Rand();
-  uint32_t ts = Rand();
-
-  InsertFrame(pid, 0, ts, false);
-  ExtractFrame();
-  CheckFrame(0, pid, 0);
-  for (int i = 1; i < 10; i += 2) {
-    ExtractFrame(15);
-    InsertFrame(pid + i + 1, 0, ts + (i + 1) * kFps10, false, pid + i);
-    clock_.AdvanceTimeMilliseconds(kFps10);
-    InsertFrame(pid + i, 0, ts + i * kFps10, false, pid + i - 1);
-    clock_.AdvanceTimeMilliseconds(kFps10);
-    ExtractFrame();
-    CheckFrame(i, pid + i, 0);
-    CheckFrame(i + 1, pid + i + 1, 0);
-  }
-}
-
 TEST_F(TestFrameBuffer2, DropTemporalLayerSlowDecoder) {
   uint16_t pid = Rand();
   uint32_t ts = Rand();
 
   InsertFrame(pid, 0, ts, false);
   InsertFrame(pid + 1, 0, ts + kFps20, false);
   for (int i = 2; i < 10; i += 2) {
     uint32_t ts_tl0 = ts + i / 2 * kFps10;
     InsertFrame(pid + i, 0, ts_tl0, false, pid + i - 2);
     InsertFrame(pid + i + 1, 0, ts_tl0 + kFps20, false, pid + i, pid + i - 1);
@@ skipping 61 matching lines @@
   InsertFrame(pid + 1, 0, ts, false, pid);
   ExtractFrame();
 
   CheckFrame(0, pid, 0);
   CheckFrame(1, pid + 2, 0);
   CheckNoFrame(2);
 }
 
 }  // namespace video_coding
 }  // namespace webrtc