commit 65feec5440ad7c5fec1299a9b24e63550bf52074
author Danil Chapovalov <danilchap@webrtc.org> Wed Aug 14 16:58:17 2019
committer Commit Bot <commit-bot@chromium.org> Thu Aug 15 07:53:53 2019
tree 62b040d7c616e555234ca84842c0a2fb6ae6cae0
parent 1b247f1e6eb1f9615a9fe09bd1285aa4b5462d13

Reenable UlpfecWithNack integration tests

To reduce flakiness, wait for ulpfec packet 30 seconds instead of 10 seconds.

Bug: webrtc:7285
Change-Id: I1ed77ed84a6cbab917fe0f7f69a26f904a2d6127
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/149070
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28864}

video/video_send_stream_tests.cc

diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index ec8c7a1..8c6ff62 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -466,13 +466,18 @@
 
 class UlpfecObserver : public test::EndToEndTest {
  public:
+  // Some of the test cases are expected to time out.
+  // Use a shorter timeout window than the default one for those.
+  static constexpr int kReducedTimeoutMs = 10000;
+
   UlpfecObserver(bool header_extensions_enabled,
                  bool use_nack,
                  bool expect_red,
                  bool expect_ulpfec,
                  const std::string& codec,
                  VideoEncoderFactory* encoder_factory)
-      : EndToEndTest(kTimeoutMs),
+      : EndToEndTest(expect_ulpfec ? VideoSendStreamTest::kDefaultTimeoutMs
+                                   : kReducedTimeoutMs),
         encoder_factory_(encoder_factory),
         payload_name_(codec),
         use_nack_(use_nack),
@@ -487,10 +492,6 @@
                                         kTransportSequenceNumberExtensionId);
   }
 
-  // Some of the test cases are expected to time out and thus we are using
-  // a shorter timeout window than the default here.
-  static constexpr size_t kTimeoutMs = 10000;
-
  private:
   Action OnSendRtp(const uint8_t* packet, size_t length) override {
     RTPHeader header;
@@ -665,8 +666,7 @@
   RunBaseTest(&test);
 }
 
-// Disabled as flaky, see https://crbug.com/webrtc/7285 for details.
-TEST_F(VideoSendStreamTest, DISABLED_DoesUtilizeUlpfecForVp8WithNackEnabled) {
+TEST_F(VideoSendStreamTest, DoesUtilizeUlpfecForVp8WithNackEnabled) {
   test::FunctionVideoEncoderFactory encoder_factory(
       []() { return VP8Encoder::Create(); });
   UlpfecObserver test(false, true, true, true, "VP8", &encoder_factory);
@@ -674,8 +674,7 @@
 }
 
 #if defined(RTC_ENABLE_VP9)
-// Disabled as flaky, see https://crbug.com/webrtc/7285 for details.
-TEST_F(VideoSendStreamTest, DISABLED_DoesUtilizeUlpfecForVp9WithNackEnabled) {
+TEST_F(VideoSendStreamTest, DoesUtilizeUlpfecForVp9WithNackEnabled) {
   test::FunctionVideoEncoderFactory encoder_factory(
       []() { return VP9Encoder::Create(); });
   UlpfecObserver test(false, true, true, true, "VP9", &encoder_factory);