Commit 2cb0787c authored by Roger Tawa's avatar Roger Tawa Committed by Commit Bot

Disable flaky tests on Win7.

WebRtcVideoDisplayPerfBrowserTests/WebRtcVideoDisplayPerfBrowserTest.MANUAL_TestVideoDisplayPerfH264/2
WebRtcVideoQualityBrowserTests/WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityVp9/0

Bug: 993020
Change-Id: Ica9095a50096f9b7667e8d4f7774ed249460537b
TBR: tommicli@chromuim.org, hbos@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1749626Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Commit-Queue: Roger Tawa <rogerta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686154}
parent 454ce328
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/strings/string_tokenizer.h" #include "base/strings/string_tokenizer.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/test/trace_event_analyzer.h" #include "base/test/trace_event_analyzer.h"
#include "build/build_config.h"
#include "chrome/browser/media/webrtc/webrtc_browsertest_base.h" #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h"
#include "chrome/browser/media/webrtc/webrtc_browsertest_common.h" #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
...@@ -462,9 +463,16 @@ IN_PROC_BROWSER_TEST_P(WebRtcVideoDisplayPerfBrowserTest, ...@@ -462,9 +463,16 @@ IN_PROC_BROWSER_TEST_P(WebRtcVideoDisplayPerfBrowserTest,
TestVideoDisplayPerf("VP9"); TestVideoDisplayPerf("VP9");
} }
// Fails consistently on Win7 builders. crbug.com/993020.
#if defined(OS_WIN)
#define MAYBE_MANUAL_TestVideoDisplayPerfH264 \
DISABLED_MANUAL_TestVideoDisplayPerfH264
#else
#define MAYBE_MANUAL_TestVideoDisplayPerfH264 MANUAL_TestVideoDisplayPerfH264
#endif
#if BUILDFLAG(RTC_USE_H264) #if BUILDFLAG(RTC_USE_H264)
IN_PROC_BROWSER_TEST_P(WebRtcVideoDisplayPerfBrowserTest, IN_PROC_BROWSER_TEST_P(WebRtcVideoDisplayPerfBrowserTest,
MANUAL_TestVideoDisplayPerfH264) { MAYBE_MANUAL_TestVideoDisplayPerfH264) {
if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. " LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
"Skipping WebRtcVideoDisplayPerfBrowserTest.MANUAL_" "Skipping WebRtcVideoDisplayPerfBrowserTest.MANUAL_"
......
...@@ -321,8 +321,14 @@ IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, ...@@ -321,8 +321,14 @@ IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
TestVideoQuality("VP8", false /* prefer_hw_video_codec */); TestVideoQuality("VP8", false /* prefer_hw_video_codec */);
} }
// Fails consistently on Win7 builders. crbug.com/993020.
#if defined(OS_WIN)
#define MAYBE_MANUAL_TestVideoQualityVp9 DISABLED_MANUAL_TestVideoQualityVp9
#else
#define MAYBE_MANUAL_TestVideoQualityVp9 MANUAL_TestVideoQualityVp9
#endif
IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
MANUAL_TestVideoQualityVp9) { MAYBE_MANUAL_TestVideoQualityVp9) {
base::ScopedAllowBlockingForTesting allow_blocking; base::ScopedAllowBlockingForTesting allow_blocking;
TestVideoQuality("VP9", true /* prefer_hw_video_codec */); TestVideoQuality("VP9", true /* prefer_hw_video_codec */);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment