From 8054c7ecf890fc78c7a36032292d8a974c7dfb90 Mon Sep 17 00:00:00 2001
From: philipel <philipel@webrtc.org>
Date: Tue, 10 Jan 2017 05:19:19 -0800
Subject: [PATCH] EndToEndTest.ReceivesAndRetransmitsNack now handles
 reordering.

Since packets can be received out of order NACKs could be triggered before any
packet was actually dropped. This cause the test to never drop packets which in
turn caused the block of code which set the |observation_complete_| event to
never execute.

BUG=webrtc:2845

Review-Url: https://codereview.webrtc.org/2613443002
Cr-Commit-Position: refs/heads/master@{#15990}
---
 webrtc/video/end_to_end_tests.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index b7ae199de0..61b75af315 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -471,13 +471,14 @@ TEST_P(EndToEndTest, ReceivesAndRetransmitsNack) {
       if (dropped_packets_.find(header.sequenceNumber) !=
           dropped_packets_.end()) {
         retransmitted_packets_.insert(header.sequenceNumber);
-        if (nacks_left_ <= 0 &&
-            retransmitted_packets_.size() == dropped_packets_.size()) {
-          observation_complete_.Set();
-        }
         return SEND_PACKET;
       }
 
+      if (nacks_left_ <= 0 &&
+          retransmitted_packets_.size() == dropped_packets_.size()) {
+        observation_complete_.Set();
+      }
+
       ++sent_rtp_packets_;
 
       // Enough NACKs received, stop dropping packets.