commit 70977183e7dfea78739eeca94dc74b290f85c5da
author Danil Chapovalov <danilchap@webrtc.org> Wed Jun 29 13:29:34 2016
committer Danil Chapovalov <danilchap@webrtc.org> Wed Jun 29 13:29:48 2016
tree 8ccc5b5f9874ea3b814bb734c4cf77ad8205bb68
parent 1b868e3226396898cf34bf45f4076e4d7a45cf04

Expanded error message for unexpected packet
in the flaky test EndToEndTest.DecodesRetransmittedFrame*

BUG=webrtc:5540
R=pbos@webrtc.org, pbos

Review URL: https://codereview.webrtc.org/2100793002 .

Cr-Original-Commit-Position: refs/heads/master@{#13323}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 18c65a448f9bcdd7bac7dfec7f78791d2e77df10

video/end_to_end_tests.cc

diff --git a/video/end_to_end_tests.cc b/video/end_to_end_tests.cc
index 89a395f..e5b12ce 100644
--- a/video/end_to_end_tests.cc
+++ b/video/end_to_end_tests.cc
@@ -790,13 +790,19 @@
       }
 
       EXPECT_EQ(kVideoSendSsrcs[0], header.ssrc)
-          << "Payload type " << static_cast<int>(header.payloadType)
-          << " not expected.";
+          << "Unexpected packet length " << length
+          << ", header_length " << header.headerLength
+          << ", padding_length " << header.paddingLength
+          << ", timestamp " << header.timestamp
+          << ", expected timestamp " << retransmitted_timestamp_
+          << ", payload type " << static_cast<int>(header.payloadType);
       EXPECT_EQ(payload_type_, header.payloadType);
 
       // Found the final packet of the frame to inflict loss to, drop this and
       // expect a retransmission.
       if (header.markerBit && ++marker_bits_observed_ == kDroppedFrameNumber) {
+        // This should be the only dropped packet.
+        EXPECT_EQ(0u, retransmitted_timestamp_);
         retransmitted_timestamp_ = header.timestamp;
         return DROP_PACKET;
       }