diff options
| author | pshenoy@chromium.org <pshenoy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 08:01:15 +0000 |
|---|---|---|
| committer | pshenoy@chromium.org <pshenoy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 08:01:15 +0000 |
| commit | 5248357eff4759ec3f905b9fa271ba9496259f92 (patch) | |
| tree | 81a22c10fa9eb03de65d3f17c8716854da977f00 /chrome/browser/extensions | |
| parent | c6efe7e0b6e55666d6286ddf850b1d6fc76664be (diff) | |
| download | chromium_src-5248357eff4759ec3f905b9fa271ba9496259f92.zip chromium_src-5248357eff4759ec3f905b9fa271ba9496259f92.tar.gz chromium_src-5248357eff4759ec3f905b9fa271ba9496259f92.tar.bz2 | |
Disable MediaGalleriesPrivateApiTest.DeviceAttachDetachEvents on Linux official bot.
BUG=315276
Review URL: https://codereview.chromium.org/61283002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc index aa2a715..79edf1f 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc @@ -106,7 +106,14 @@ class MediaGalleriesPrivateApiTest : public ExtensionApiTest { DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateApiTest); }; -IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest, DeviceAttachDetachEvents) { +// Fails on official Linux bot. See http://crbug.com/315276 +#if defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX) +#define MAYBE_DeviceAttachDetachEvents DISABLED_DeviceAttachDetachEvents +#else +#define MAYBE_DeviceAttachDetachEvents DeviceAttachDetachEvents +#endif +IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest, + MAYBE_DeviceAttachDetachEvents) { // Setup. TestStorageMonitor::SyncInitialize(); const extensions::Extension* extension = |