diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 17:29:50 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 17:29:50 +0000 |
| commit | b57286fc2f87bc9da060db89c23c1c7f413fe52e (patch) | |
| tree | 62382df608892aa55bd29bccc722c0cb52ca1175 /chrome | |
| parent | bae413af85304bbb1c38d81542a5feae4e3ff4c2 (diff) | |
| download | chromium_src-b57286fc2f87bc9da060db89c23c1c7f413fe52e.zip chromium_src-b57286fc2f87bc9da060db89c23c1c7f413fe52e.tar.gz chromium_src-b57286fc2f87bc9da060db89c23c1c7f413fe52e.tar.bz2 | |
ui_tests: disable timing out media tests on Windows.
Together, these sit for two minutes and fail every run.
BUG=55477,56364
Review URL: http://codereview.chromium.org/3586003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/media_uitest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc index c13cb71..08e2579 100644 --- a/chrome/browser/media_uitest.cc +++ b/chrome/browser/media_uitest.cc @@ -50,14 +50,14 @@ class MediaTest : public UITest { #if defined(OS_WIN) -// Tests may fail on windows: http://crbug.com/55477 -#define MAYBE_VideoBearTheora FLAKY_VideoBearTheora -#define MAYBE_VideoBearSilentTheora FLAKY_VideoBearSilentTheora -#define MAYBE_VideoBearWebm FLAKY_VideoBearWebm -#define MAYBE_VideoBearSilentWebm FLAKY_VideoBearSilentWebm -#define MAYBE_VideoBearMp4 FLAKY_VideoBearMp4 -#define MAYBE_VideoBearSilentMp4 FLAKY_VideoBearSilentMp4 -#define MAYBE_MediaUILayoutTest FLAKY_MediaUILayoutTest +// Tests always fail on windows: http://crbug.com/55477 +#define MAYBE_VideoBearTheora DISABLED_VideoBearTheora +#define MAYBE_VideoBearSilentTheora DISABLED_VideoBearSilentTheora +#define MAYBE_VideoBearWebm DISABLED_VideoBearWebm +#define MAYBE_VideoBearSilentWebm DISABLED_VideoBearSilentWebm +#define MAYBE_VideoBearMp4 DISABLED_VideoBearMp4 +#define MAYBE_VideoBearSilentMp4 DISABLED_VideoBearSilentMp4 +#define MAYBE_MediaUILayoutTest DISABLED_MediaUILayoutTest #else |