diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 21:15:27 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 21:15:27 +0000 |
| commit | c112a8f4e8234a28760fc8e79372678b29d40d83 (patch) | |
| tree | 53470bebd515f3b0f85f010b9646c736fdcdb0d5 /chrome/test | |
| parent | c5f7ef573bcbfeb66a42df1a090f3abd9f9117ec (diff) | |
| download | chromium_src-c112a8f4e8234a28760fc8e79372678b29d40d83.zip chromium_src-c112a8f4e8234a28760fc8e79372678b29d40d83.tar.gz chromium_src-c112a8f4e8234a28760fc8e79372678b29d40d83.tar.bz2 | |
Disable the DeletePluginInDeallocate test on Mac.
BUG=95558
Review URL: http://codereview.chromium.org/7840011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc index 577ac59..51d2743 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -160,7 +160,14 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNewStream) { TestTimeouts::action_max_timeout_ms()); } -TEST_F(NPAPIVisiblePluginTester, DeletePluginInDeallocate) { +// http://crbug.com/95558 +// This test fails frequently on Mac, so it is disabled for now. +#if defined(OS_MACOSX) +#define MAYBE_DeletePluginInDeallocate DISABLED_DeletePluginInDeallocate +#else +#define MAYBE_DeletePluginInDeallocate DeletePluginInDeallocate +#endif +TEST_F(NPAPIVisiblePluginTester, MAYBE_DeletePluginInDeallocate) { show_window_ = true; const FilePath test_case( FILE_PATH_LITERAL("plugin_delete_in_deallocate.html")); |