commit 90d0a627c48f629732d9058296a0a557aa5d3d9d
author Ilya Nikolaevskiy <ilnik@webrtc.org> Tue Jan 15 13:28:59 2019
committer Commit Bot <commit-bot@chromium.org> Wed Jan 16 13:51:06 2019
tree fef0b890996a3dd9f65d54091b6f4abc380f6658
parent 50e77457db87b6a1e5812c24527e9b6dc86d5b2e

Deflake VideoSendStreamTest.SupportsVideoTimingFrames

Bug: none
Change-Id: I1544bb699056acbe55058da615004d137e932d96
Reviewed-on: https://webrtc-review.googlesource.com/c/117640
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26280}

video/video_send_stream_tests.cc

diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index 3264ce7..821db3a 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -399,7 +399,8 @@
 TEST_P(VideoSendStreamTest, SupportsVideoTimingFrames) {
   class VideoTimingObserver : public test::SendTest {
    public:
-    VideoTimingObserver() : SendTest(kDefaultTimeoutMs) {
+    VideoTimingObserver()
+        : SendTest(kDefaultTimeoutMs), first_frame_sent_(false) {
       EXPECT_TRUE(parser_->RegisterRtpHeaderExtension(
           kRtpExtensionVideoTiming, test::kVideoTimingExtensionId));
     }
@@ -408,10 +409,13 @@
       RTPHeader header;
       EXPECT_TRUE(parser_->Parse(packet, length, &header));
       // Only the last packet of the frame must have extension.
-      if (!header.markerBit)
+      // Also don't check packets of the second frame if they happen to get
+      // through before the test terminates.
+      if (!header.markerBit || first_frame_sent_)
         return SEND_PACKET;
       EXPECT_TRUE(header.extension.has_video_timing);
       observation_complete_.Set();
+      first_frame_sent_ = true;
       return SEND_PACKET;
     }
 
@@ -427,6 +431,9 @@
     void PerformTest() override {
       EXPECT_TRUE(Wait()) << "Timed out while waiting for timing frames.";
     }
+
+   private:
+    bool first_frame_sent_;
   } test;
 
   RunBaseTest(&test);