diff options
| author | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 08:54:23 +0000 |
|---|---|---|
| committer | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 08:54:23 +0000 |
| commit | 98f32eb3b654ce4e115a602b0efc2c27544687c2 (patch) | |
| tree | 42f70e911ead8f71cd7afe7ccd6e51740e0bc89f | |
| parent | ab8fafc16bdb745d88a8b05f199c4be11a232493 (diff) | |
| download | chromium_src-98f32eb3b654ce4e115a602b0efc2c27544687c2.zip chromium_src-98f32eb3b654ce4e115a602b0efc2c27544687c2.tar.gz chromium_src-98f32eb3b654ce4e115a602b0efc2c27544687c2.tar.bz2 | |
Disable two flaky WebRTC tests on Linux.
There are three tests failing in the bug. Starting with disabling these two.
TBR=fischman@chromium.org
BUG=340197
Review URL: https://codereview.chromium.org/144903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248455 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc index a3ddf07..14a06e45 100644 --- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc @@ -370,7 +370,8 @@ bool RunPesq(const base::FilePath& reference_file, return true; } -#if defined(OS_LINUX) || defined(OS_WIN) +// Should be enabled for Linux, but is flaky. http://crbug.com/340197. +#if defined(OS_WIN) // Only implemented on Linux and Windows for now. #define MAYBE_MANUAL_TestAudioQuality MANUAL_TestAudioQuality #else diff --git a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc index bffb7f2..50ef1cb 100644 --- a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc @@ -316,8 +316,14 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase { scoped_ptr<base::Environment> environment_; }; +// Flaky on Linux. http://crbug.com/340197. +#if defined(OS_LINUX) +#define MAYBE_MANUAL_TestVGAVideoQuality DISABLED_MANUAL_TestVGAVideoQuality +#else +#define MAYBE_MANUAL_TestVGAVideoQuality MANUAL_TestVGAVideoQuality +#endif IN_PROC_BROWSER_TEST_F(WebRtcVideoQualityBrowserTest, - MANUAL_TestVGAVideoQuality) { + MAYBE_MANUAL_TestVGAVideoQuality) { ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 150) << "This is a long-running test; you must specify " "--ui-test-action-max-timeout to have a value of at least 150000."; |