Disable failing fullstack test with 15 thumbnail streams

webrtc/video/full_stack_tests.cc

 /*
  *  Copyright (c) 2013 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.
  */
 #include <stdio.h>
@@ skipping 489 matching lines @@
   video_params_low.video = kSimulcastVp8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   large_room.num_thumbnails = 5;
   large_room.ss = {streams, 2, 1, 0};
   RunTest(large_room);
 }
 
-TEST_F(FullStackTest, LargeRoomVP8_15thumb) {
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN)
+// Fails on Android and win:
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=7301
+#define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb
+#else
+#define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb
+#endif
+
+TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) {
   VideoQualityTest::Params large_room;
   large_room.call.send_side_bwe = true;
   large_room.video = kSimulcastVp8VideoHigh;
   large_room.analyzer = {"largeroom_15thumb", 0.0, 0.0,
                          kFullStackTestDurationSecs};
   large_room.pipe.loss_percent = 0;
   large_room.pipe.queue_delay_ms = 100;
   VideoQualityTest::Params video_params_high;
   video_params_high.video = kSimulcastVp8VideoHigh;
   VideoQualityTest::Params video_params_medium;
   video_params_medium.video = kSimulcastVp8VideoMedium;
   VideoQualityTest::Params video_params_low;
   video_params_low.video = kSimulcastVp8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   large_room.num_thumbnails = 15;
   large_room.ss = {streams, 2, 1, 0};
   RunTest(large_room);
 }
 
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN)
-// Fails on Android and win:
-// https://bugs.chromium.org/p/webrtc/issues/detail?id=7301
-#define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb
-#else
-#define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb
-#endif
-
 TEST_F(FullStackTest, MAYBE_LargeRoomVP8_50thumb) {
   VideoQualityTest::Params large_room;
   large_room.call.send_side_bwe = true;
   large_room.video = kSimulcastVp8VideoHigh;
   large_room.analyzer = {"largeroom_50thumb", 0.0, 0.0,
                          kFullStackTestDurationSecs};
   large_room.pipe.loss_percent = 0;
   large_room.pipe.queue_delay_ms = 100;
   VideoQualityTest::Params video_params_high;
   video_params_high.video = kSimulcastVp8VideoHigh;
   VideoQualityTest::Params video_params_medium;
   video_params_medium.video = kSimulcastVp8VideoMedium;
   VideoQualityTest::Params video_params_low;
   video_params_low.video = kSimulcastVp8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   large_room.num_thumbnails = 50;
   large_room.ss = {streams, 2, 1, 0};
   RunTest(large_room);
 }
 
 
 }  // namespace webrtc