diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 00:49:30 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 00:49:30 +0000 |
| commit | dd771735ad7997cdb1fa88f17cc6bf2c63c35550 (patch) | |
| tree | d82a8d02f2a6cc82b6ba7d24f4e420e163951496 /chrome | |
| parent | b39adf0fa1eb4c300f4c10ffecd6d3b13d91c006 (diff) | |
| download | chromium_src-dd771735ad7997cdb1fa88f17cc6bf2c63c35550.zip chromium_src-dd771735ad7997cdb1fa88f17cc6bf2c63c35550.tar.gz chromium_src-dd771735ad7997cdb1fa88f17cc6bf2c63c35550.tar.bz2 | |
Reenable UILayoutTest.MediaUILayoutTest on Linux
MediaUILayoutTest passes on linux locally, so this reenables the test
and marks it as flaky for linux.
BUG=56364
TEST=ui_tests
Review URL: http://codereview.chromium.org/5533001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/media_uitest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc index fbbdebc..61861e0 100644 --- a/chrome/browser/media_uitest.cc +++ b/chrome/browser/media_uitest.cc @@ -66,10 +66,10 @@ class MediaTest : public UITest { }; #if defined(OS_LINUX) -// Test fails on linux: http://crbug.com/56364 -#define MAYBE_MediaUILayoutTest DISABLED_MediaUILayoutTest -#else -#define MAYBE_MediaUILayoutTest MediaUILayoutTest +// Test appears to be fine on linux, but let's first change to flaky and +// see how that goes. +// http://crbug.com/56364 +#define MediaUILayoutTest FLAKY_MediaUILayoutTest #endif TEST_F(MediaTest, VideoBearTheora) { @@ -102,7 +102,7 @@ TEST_F(MediaTest, VideoBearWav) { PlayVideo("bear.wav"); } -TEST_F(UILayoutTest, MAYBE_MediaUILayoutTest) { +TEST_F(UILayoutTest, MediaUILayoutTest) { static const char* kResources[] = { "content", "media-file.js", |